diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 00000000..278e92c2
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,6 @@
+# Copilot Instructions
+
+## Project Guidelines
+- This project (EntityFrameworkCore.Jet) targets the Microsoft Access Jet/ACE database engine, not SQL Server. Generated SQL, type mappings, and literals must be Jet/ACE-compliant (e.g. decimal/currency instead of bigint, #...# date literals, TIMEVALUE()). Note: Access 2016+ (ACE) does have a native BIGINT (Large Number) type, which is a SIGNED 64-bit integer and cannot hold unsigned values like ulong.MaxValue; unsigned ulong/uint should map to decimal(20,0) to avoid overflow. Provider distinctions are OLE DB / ODBC via the ACE/Jet driver rather than SqlClient. Do not assume SQL Server/T-SQL semantics.
+- Jet/Access SQL dialect used in this project does not support COALESCE or NZ. When rewriting queries for Jet, prefer using IIF(<expr> IS NULL, <default>, <expr>) or 'CASE WHEN <expr> IS NULL THEN <default> ELSE <expr> END' instead.
+- Deferred enhancement for EntityFrameworkCore.Jet: add ACE engine-version detection so that on Access 2016+ the provider can map to native BIGINT (signed long; unsigned ulong/uint still go to decimal(20,0)) and native DATETIME2, while falling back to decimal(20,0)/legacy datetime on older ACE versions. Not a priority right now.
\ No newline at end of file
diff --git a/.github/workflows/auto_commit.yml b/.github/workflows/auto_commit.yml
index a54bada3..cfaf66c3 100644
--- a/.github/workflows/auto_commit.yml
+++ b/.github/workflows/auto_commit.yml
@@ -11,7 +11,7 @@ jobs:
     if: github.event.workflow_run.conclusion == 'success' && (github.event.workflow_run.head_commit.author.email != 'github-actions@github.com' || github.event.workflow_run.head_commit.message != '[GitHub Actions] Update green tests.')
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ github.event.workflow_run.head_repository.full_name }}
           ref: ${{ github.event.workflow_run.head_branch }}
@@ -19,7 +19,7 @@ jobs:
           fetch-depth: 0
       - name: 'Download Green Tests'
         id: DownloadGreenTests
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index b86962ee..4894c9aa 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -28,7 +28,7 @@ jobs:
         run: |
           echo 'EventName: ${{ github.event_name }}'
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: ${{ env.checkoutFetchDepth }}
       - name: 'Get Head Commit Info'
@@ -76,7 +76,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set additional variables
         shell: pwsh
         run: |
@@ -229,30 +229,31 @@ jobs:
         run: |
           $env:EFCoreJet_DefaultConnection = '${{ env.defaultConnection }}'
           & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.Tests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m
-      - name: 'Run Tests: EFCore.Jet.FunctionalTests'
+      - name: 'Run Tests: EFCore.Jet.FunctionalTests (Shard 1 - Query Core)'
         if: always() && env.skipTests != 'true'
         shell: pwsh
         run: |
+          $shardDir = '.\test\EFCore.Jet.FunctionalTests\TestResults\shard1'
+
           for ($i = 0; $i -lt 3; $i++) {
-            if (Test-Path '.\test\EFCore.Jet.FunctionalTests\TestResults' -PathType Container) {
-              Get-ChildItem '.\test\EFCore.Jet.FunctionalTests\TestResults' | Remove-Item -Recurse -Force
+            if (Test-Path $shardDir -PathType Container) {
+              Get-ChildItem $shardDir | Remove-Item -Recurse -Force
             }
 
             $env:EFCoreJet_DefaultConnection = '${{ env.defaultConnection }}'
-            & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.FunctionalTests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m
+            & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.FunctionalTests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m --results-directory $shardDir --filter "FullyQualifiedName~.FunctionalTests.Query.&FullyQualifiedName!~.FunctionalTests.Query.Associations.&FullyQualifiedName!~.FunctionalTests.Query.Translations."
 
             #
             # Check for test runner crashes:
             #
 
-            $testResultsDir = '.\test\EFCore.Jet.FunctionalTests\TestResults'
-            $currentTestRunTrx = Get-ChildItem $testResultsDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
+            $currentTestRunTrx = Get-ChildItem $shardDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
             if ($null -eq $currentTestRunTrx) {
                 echo 'Test runner log file is missing.'
                 exit 3
             }
 
-            $currentTestRunDir = Join-Path $testResultsDir $currentTestRunTrx.BaseName
+            $currentTestRunDir = Join-Path $shardDir $currentTestRunTrx.BaseName
             if (Test-Path $currentTestRunDir) {
               if ($null -ne (Get-ChildItem $currentTestRunDir -Filter 'Sequence_*' -Recurse)) {
                 # Split string because searching the log for that phrase should only show actual crashes and not this line.
@@ -267,7 +268,97 @@ jobs:
 
           $establishedGreenTestsFilePath = ".\test\EFCore.Jet.FunctionalTests\GreenTests\ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}.txt"
           $failIfKeepsCrashing = Test-Path $establishedGreenTestsFilePath
-          
+
+          if ($i -ge 3 -and $failIfKeepsCrashing) {
+            echo 'Test runner keeps crashing.'
+            exit 2
+          }
+          exit 0
+      - name: 'Run Tests: EFCore.Jet.FunctionalTests (Shard 2 - Query Associations and Translations)'
+        if: always() && env.skipTests != 'true'
+        shell: pwsh
+        run: |
+          $shardDir = '.\test\EFCore.Jet.FunctionalTests\TestResults\shard2'
+
+          for ($i = 0; $i -lt 3; $i++) {
+            if (Test-Path $shardDir -PathType Container) {
+              Get-ChildItem $shardDir | Remove-Item -Recurse -Force
+            }
+
+            $env:EFCoreJet_DefaultConnection = '${{ env.defaultConnection }}'
+            & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.FunctionalTests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m --results-directory $shardDir --filter "FullyQualifiedName~.FunctionalTests.Query.Associations.|FullyQualifiedName~.FunctionalTests.Query.Translations."
+
+            #
+            # Check for test runner crashes:
+            #
+
+            $currentTestRunTrx = Get-ChildItem $shardDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
+            if ($null -eq $currentTestRunTrx) {
+                echo 'Test runner log file is missing.'
+                exit 3
+            }
+
+            $currentTestRunDir = Join-Path $shardDir $currentTestRunTrx.BaseName
+            if (Test-Path $currentTestRunDir) {
+              if ($null -ne (Get-ChildItem $currentTestRunDir -Filter 'Sequence_*' -Recurse)) {
+                # Split string because searching the log for that phrase should only show actual crashes and not this line.
+                echo ('Test runner cras' + 'hed.')
+                continue
+              }
+            }
+
+            echo 'Test runner ran until the end.'
+            break
+          }
+
+          $establishedGreenTestsFilePath = ".\test\EFCore.Jet.FunctionalTests\GreenTests\ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}.txt"
+          $failIfKeepsCrashing = Test-Path $establishedGreenTestsFilePath
+
+          if ($i -ge 3 -and $failIfKeepsCrashing) {
+            echo 'Test runner keeps crashing.'
+            exit 2
+          }
+          exit 0
+      - name: 'Run Tests: EFCore.Jet.FunctionalTests (Shard 3 - Non-Query)'
+        if: always() && env.skipTests != 'true'
+        shell: pwsh
+        run: |
+          $shardDir = '.\test\EFCore.Jet.FunctionalTests\TestResults\shard3'
+
+          for ($i = 0; $i -lt 3; $i++) {
+            if (Test-Path $shardDir -PathType Container) {
+              Get-ChildItem $shardDir | Remove-Item -Recurse -Force
+            }
+
+            $env:EFCoreJet_DefaultConnection = '${{ env.defaultConnection }}'
+            & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.FunctionalTests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m --results-directory $shardDir --filter "FullyQualifiedName!~.FunctionalTests.Query."
+
+            #
+            # Check for test runner crashes:
+            #
+
+            $currentTestRunTrx = Get-ChildItem $shardDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
+            if ($null -eq $currentTestRunTrx) {
+                echo 'Test runner log file is missing.'
+                exit 3
+            }
+
+            $currentTestRunDir = Join-Path $shardDir $currentTestRunTrx.BaseName
+            if (Test-Path $currentTestRunDir) {
+              if ($null -ne (Get-ChildItem $currentTestRunDir -Filter 'Sequence_*' -Recurse)) {
+                # Split string because searching the log for that phrase should only show actual crashes and not this line.
+                echo ('Test runner cras' + 'hed.')
+                continue
+              }
+            }
+
+            echo 'Test runner ran until the end.'
+            break
+          }
+
+          $establishedGreenTestsFilePath = ".\test\EFCore.Jet.FunctionalTests\GreenTests\ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}.txt"
+          $failIfKeepsCrashing = Test-Path $establishedGreenTestsFilePath
+
           if ($i -ge 3 -and $failIfKeepsCrashing) {
             echo 'Test runner keeps crashing.'
             exit 2
@@ -280,51 +371,56 @@ jobs:
           Get-ChildItem -Filter '*.trx' -Recurse | Sort-Object LastWriteTime | ForEach { Rename-Item $_.FullName "ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}_$($_.Name)" -Verbose }
       - name: 'Upload Test Results'
         if: always() && env.skipTests != 'true' && env.uploadTestResults == 'true'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: test-results_${{ env.matrixId }}
           path: |
             test\EFCore.Jet.Data.Tests\TestResults\*.trx
-            test\EFCore.Jet.FunctionalTests\TestResults\*.trx
+            test\EFCore.Jet.FunctionalTests\TestResults\**\*.trx
             test\EFCore.Jet.Tests\TestResults\*.trx
       - name: 'Check Tests: EFCore.Jet.FunctionalTests'
         if: env.skipTests != 'true'
         shell: pwsh
         run: |
-          # Create text file with all tests that passed.
+          # Collect and merge test results from all shards.
           $testResultsDir = '.\test\EFCore.Jet.FunctionalTests\TestResults'
-          $currentTestRunTrx = Get-ChildItem $testResultsDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
+          $allTrxFiles = @(Get-ChildItem $testResultsDir -Filter '*.trx' -Recurse)
 
-          if ($null -eq $currentTestRunTrx) {
-              echo 'Test runner log file is missing.'
+          if ($allTrxFiles.Count -eq 0) {
+              echo 'No test result files found.'
               exit 3
           }
 
-          $allTestsFilePath = Join-Path $currentTestRunTrx.DirectoryName ($currentTestRunTrx.BaseName + '_All.txt')
-          (Select-Xml -Path  $currentTestRunTrx.FullName -XPath "//ns:UnitTestResult" -Namespace @{"ns"="http://microsoft.com/schemas/VisualStudio/TeamTest/2010"}).Node | Sort-Object -Property testName -CaseSensitive | ForEach-Object { "$($_.outcome -eq 'Passed' ? 'P' : $_.outcome -eq 'NotExecuted' ? 'N' : $_.outcome -eq 'Failed' ? 'F' : 'U') $($_.testName)" } | Add-Content $allTestsFilePath
+          $allNodes = @()
+          foreach ($trxFile in $allTrxFiles) {
+              $allNodes += (Select-Xml -Path $trxFile.FullName -XPath "//ns:UnitTestResult" -Namespace @{"ns"="http://microsoft.com/schemas/VisualStudio/TeamTest/2010"}).Node
+          }
+
+          $allTestsFilePath = Join-Path $testResultsDir 'combined_All.txt'
+          $allNodes | Sort-Object -Property testName -CaseSensitive | ForEach-Object { "$($_.outcome -eq 'Passed' ? 'P' : $_.outcome -eq 'NotExecuted' ? 'N' : $_.outcome -eq 'Failed' ? 'F' : 'U') $($_.testName)" } | Set-Content $allTestsFilePath
 
-          $greenTestsFilePath = Join-Path $currentTestRunTrx.DirectoryName ($currentTestRunTrx.BaseName + '_Passed.txt')
-          Get-Content $allTestsFilePath | Where-Object { $_.StartsWith('P ') } | ForEach-Object { $_.Substring(2) } | Add-Content $greenTestsFilePath
+          $greenTestsFilePath = Join-Path $testResultsDir 'combined_Passed.txt'
+          Get-Content $allTestsFilePath | Where-Object { $_.StartsWith('P ') } | ForEach-Object { $_.Substring(2) } | Set-Content $greenTestsFilePath
 
           # Compare test file against previously committed file.
           $establishedGreenTestsFilePath = ".\test\EFCore.Jet.FunctionalTests\GreenTests\ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}.txt"
 
           if (Test-Path $establishedGreenTestsFilePath) {
               $diffResult = Compare-Object (Get-Content $establishedGreenTestsFilePath) (Get-Content $greenTestsFilePath)
-          
+
               $notGreenAnymore = $diffResult | Where-Object { $_.SideIndicator -eq '<=' } | Select-Object -ExpandProperty InputObject
               if ($null -ne $notGreenAnymore) {
                   echo "`nThe following $(@($notGreenAnymore).Length) tests passed in previous runs, but didn't pass in this run:`n"
                   $notGreenAnymore
                   exit 1
               }
-          
+
               echo 'All tests that passed in previous runs still passed in this run.'
 
               $newlyGreenTests = $diffResult | Where-Object { $_.SideIndicator -eq '=>' } | Select-Object -ExpandProperty InputObject
               if ($newlyGreenTests.Length -gt 0) {
                 Copy-Item $greenTestsFilePath $establishedGreenTestsFilePath -Force -Verbose
-                
+
                 echo "`nThe following new tests passed that did not pass before:`n"
                 $newlyGreenTests
 
@@ -335,7 +431,7 @@ jobs:
           echo 'Check succeeded.'
       - name: 'Upload Green Tests'
         if: env.commitGreenTestsFile != '' && env.autoCommitGreenTests == 'true'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: green-tests_${{ env.matrixId }}
           path: ${{ env.commitGreenTestsFile }}
@@ -349,7 +445,7 @@ jobs:
     steps:
       - name: 'Check Test Results Artifacts'
         id: CheckTestResultsArtifacts
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -369,14 +465,14 @@ jobs:
       - name: 'Merge Test Results'
         id: MergeTestResults
         if: steps.CheckTestResultsArtifacts.outputs.artifactsAvailable == 'true'
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v6
         with:
           name: test-results
           pattern: test-results_*
           delete-merged: true
       - name: 'Check Green Tests Artifacts'
         id: CheckGreenTestsArtifacts
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -396,7 +492,7 @@ jobs:
       - name: 'Merge Green Tests'
         id: MergeGreenTests
         if: steps.CheckGreenTestsArtifacts.outputs.artifactsAvailable == 'true'
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v6
         with:
           name: green-tests
           pattern: green-tests_*
@@ -418,7 +514,7 @@ jobs:
 #          echo $env:NEEDS_CONTEXT
       - name: 'Download Green Tests'
         if: needs.MergeArtifacts.outputs.greenTestsAvailable == 'true'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: green-tests
           path: green-tests
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 01c90999..ecad2fd2 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -30,7 +30,7 @@ jobs:
         run: |
           echo 'EventName: ${{ github.event_name }}'
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: ${{ env.checkoutFetchDepth }}
       - name: 'Get Head Commit Info'
@@ -78,7 +78,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set additional variables
         shell: pwsh
         run: |
@@ -231,30 +231,31 @@ jobs:
         run: |
           $env:EFCoreJet_DefaultConnection = '${{ env.defaultConnection }}'
           & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.Tests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m
-      - name: 'Run Tests: EFCore.Jet.FunctionalTests'
+      - name: 'Run Tests: EFCore.Jet.FunctionalTests (Shard 1 - Query Core)'
         if: always() && env.skipTests != 'true'
         shell: pwsh
         run: |
+          $shardDir = '.\test\EFCore.Jet.FunctionalTests\TestResults\shard1'
+
           for ($i = 0; $i -lt 3; $i++) {
-            if (Test-Path '.\test\EFCore.Jet.FunctionalTests\TestResults' -PathType Container) {
-              Get-ChildItem '.\test\EFCore.Jet.FunctionalTests\TestResults' | Remove-Item -Recurse -Force
+            if (Test-Path $shardDir -PathType Container) {
+              Get-ChildItem $shardDir | Remove-Item -Recurse -Force
             }
 
             $env:EFCoreJet_DefaultConnection = '${{ env.defaultConnection }}'
-            & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.FunctionalTests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m
+            & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.FunctionalTests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m --results-directory $shardDir --filter "FullyQualifiedName~.FunctionalTests.Query.&FullyQualifiedName!~.FunctionalTests.Query.Associations.&FullyQualifiedName!~.FunctionalTests.Query.Translations."
 
             #
             # Check for test runner crashes:
             #
 
-            $testResultsDir = '.\test\EFCore.Jet.FunctionalTests\TestResults'
-            $currentTestRunTrx = Get-ChildItem $testResultsDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
+            $currentTestRunTrx = Get-ChildItem $shardDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
             if ($null -eq $currentTestRunTrx) {
                 echo 'Test runner log file is missing.'
                 exit 3
             }
 
-            $currentTestRunDir = Join-Path $testResultsDir $currentTestRunTrx.BaseName
+            $currentTestRunDir = Join-Path $shardDir $currentTestRunTrx.BaseName
             if (Test-Path $currentTestRunDir) {
               if ($null -ne (Get-ChildItem $currentTestRunDir -Filter 'Sequence_*' -Recurse)) {
                 # Split string because searching the log for that phrase should only show actual crashes and not this line.
@@ -269,7 +270,97 @@ jobs:
 
           $establishedGreenTestsFilePath = ".\test\EFCore.Jet.FunctionalTests\GreenTests\ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}.txt"
           $failIfKeepsCrashing = Test-Path $establishedGreenTestsFilePath
-          
+
+          if ($i -ge 3 -and $failIfKeepsCrashing) {
+            echo 'Test runner keeps crashing.'
+            exit 2
+          }
+          exit 0
+      - name: 'Run Tests: EFCore.Jet.FunctionalTests (Shard 2 - Query Associations and Translations)'
+        if: always() && env.skipTests != 'true'
+        shell: pwsh
+        run: |
+          $shardDir = '.\test\EFCore.Jet.FunctionalTests\TestResults\shard2'
+
+          for ($i = 0; $i -lt 3; $i++) {
+            if (Test-Path $shardDir -PathType Container) {
+              Get-ChildItem $shardDir | Remove-Item -Recurse -Force
+            }
+
+            $env:EFCoreJet_DefaultConnection = '${{ env.defaultConnection }}'
+            & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.FunctionalTests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m --results-directory $shardDir --filter "FullyQualifiedName~.FunctionalTests.Query.Associations.|FullyQualifiedName~.FunctionalTests.Query.Translations."
+
+            #
+            # Check for test runner crashes:
+            #
+
+            $currentTestRunTrx = Get-ChildItem $shardDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
+            if ($null -eq $currentTestRunTrx) {
+                echo 'Test runner log file is missing.'
+                exit 3
+            }
+
+            $currentTestRunDir = Join-Path $shardDir $currentTestRunTrx.BaseName
+            if (Test-Path $currentTestRunDir) {
+              if ($null -ne (Get-ChildItem $currentTestRunDir -Filter 'Sequence_*' -Recurse)) {
+                # Split string because searching the log for that phrase should only show actual crashes and not this line.
+                echo ('Test runner cras' + 'hed.')
+                continue
+              }
+            }
+
+            echo 'Test runner ran until the end.'
+            break
+          }
+
+          $establishedGreenTestsFilePath = ".\test\EFCore.Jet.FunctionalTests\GreenTests\ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}.txt"
+          $failIfKeepsCrashing = Test-Path $establishedGreenTestsFilePath
+
+          if ($i -ge 3 -and $failIfKeepsCrashing) {
+            echo 'Test runner keeps crashing.'
+            exit 2
+          }
+          exit 0
+      - name: 'Run Tests: EFCore.Jet.FunctionalTests (Shard 3 - Non-Query)'
+        if: always() && env.skipTests != 'true'
+        shell: pwsh
+        run: |
+          $shardDir = '.\test\EFCore.Jet.FunctionalTests\TestResults\shard3'
+
+          for ($i = 0; $i -lt 3; $i++) {
+            if (Test-Path $shardDir -PathType Container) {
+              Get-ChildItem $shardDir | Remove-Item -Recurse -Force
+            }
+
+            $env:EFCoreJet_DefaultConnection = '${{ env.defaultConnection }}'
+            & '${{ env.dotnetExecutable }}' test .\test\EFCore.Jet.FunctionalTests --configuration '${{ env.buildConfiguration }}' -p:FixedTestOrder=${{ env.deterministicTests }} --logger trx --verbosity detailed --blame-hang-timeout 3m --results-directory $shardDir --filter "FullyQualifiedName!~.FunctionalTests.Query."
+
+            #
+            # Check for test runner crashes:
+            #
+
+            $currentTestRunTrx = Get-ChildItem $shardDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
+            if ($null -eq $currentTestRunTrx) {
+                echo 'Test runner log file is missing.'
+                exit 3
+            }
+
+            $currentTestRunDir = Join-Path $shardDir $currentTestRunTrx.BaseName
+            if (Test-Path $currentTestRunDir) {
+              if ($null -ne (Get-ChildItem $currentTestRunDir -Filter 'Sequence_*' -Recurse)) {
+                # Split string because searching the log for that phrase should only show actual crashes and not this line.
+                echo ('Test runner cras' + 'hed.')
+                continue
+              }
+            }
+
+            echo 'Test runner ran until the end.'
+            break
+          }
+
+          $establishedGreenTestsFilePath = ".\test\EFCore.Jet.FunctionalTests\GreenTests\ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}.txt"
+          $failIfKeepsCrashing = Test-Path $establishedGreenTestsFilePath
+
           if ($i -ge 3 -and $failIfKeepsCrashing) {
             echo 'Test runner keeps crashing.'
             exit 2
@@ -282,31 +373,36 @@ jobs:
           Get-ChildItem -Filter '*.trx' -Recurse | Sort-Object LastWriteTime | ForEach { Rename-Item $_.FullName "ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}_$($_.Name)" -Verbose }
       - name: 'Upload Test Results'
         if: always() && env.skipTests != 'true' && env.uploadTestResults == 'true'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: test-results_${{ env.matrixId }}
           path: |
             test\EFCore.Jet.Data.Tests\TestResults\*.trx
-            test\EFCore.Jet.FunctionalTests\TestResults\*.trx
+            test\EFCore.Jet.FunctionalTests\TestResults\**\*.trx
             test\EFCore.Jet.Tests\TestResults\*.trx
       - name: 'Check Tests: EFCore.Jet.FunctionalTests'
         if: env.skipTests != 'true'
         shell: pwsh
         run: |
-          # Create text file with all tests that passed.
+          # Collect and merge test results from all shards.
           $testResultsDir = '.\test\EFCore.Jet.FunctionalTests\TestResults'
-          $currentTestRunTrx = Get-ChildItem $testResultsDir -Filter '*.trx' | Sort-Object LastWriteTime | Select-Object -Last 1
+          $allTrxFiles = @(Get-ChildItem $testResultsDir -Filter '*.trx' -Recurse)
 
-          if ($null -eq $currentTestRunTrx) {
-              echo 'Test runner log file is missing.'
+          if ($allTrxFiles.Count -eq 0) {
+              echo 'No test result files found.'
               exit 3
           }
 
-          $allTestsFilePath = Join-Path $currentTestRunTrx.DirectoryName ($currentTestRunTrx.BaseName + '_All.txt')
-          (Select-Xml -Path  $currentTestRunTrx.FullName -XPath "//ns:UnitTestResult" -Namespace @{"ns"="http://microsoft.com/schemas/VisualStudio/TeamTest/2010"}).Node | Sort-Object -Property testName -CaseSensitive | ForEach-Object { "$($_.outcome -eq 'Passed' ? 'P' : $_.outcome -eq 'NotExecuted' ? 'N' : $_.outcome -eq 'Failed' ? 'F' : 'U') $($_.testName)" } | Add-Content $allTestsFilePath
+          $allNodes = @()
+          foreach ($trxFile in $allTrxFiles) {
+              $allNodes += (Select-Xml -Path $trxFile.FullName -XPath "//ns:UnitTestResult" -Namespace @{"ns"="http://microsoft.com/schemas/VisualStudio/TeamTest/2010"}).Node
+          }
 
-          $greenTestsFilePath = Join-Path $currentTestRunTrx.DirectoryName ($currentTestRunTrx.BaseName + '_Passed.txt')
-          Get-Content $allTestsFilePath | Where-Object { $_.StartsWith('P ') } | ForEach-Object { $_.Substring(2) } | Add-Content $greenTestsFilePath
+          $allTestsFilePath = Join-Path $testResultsDir 'combined_All.txt'
+          $allNodes | Sort-Object -Property testName -CaseSensitive | ForEach-Object { "$($_.outcome -eq 'Passed' ? 'P' : $_.outcome -eq 'NotExecuted' ? 'N' : $_.outcome -eq 'Failed' ? 'F' : 'U') $($_.testName)" } | Set-Content $allTestsFilePath
+
+          $greenTestsFilePath = Join-Path $testResultsDir 'combined_Passed.txt'
+          Get-Content $allTestsFilePath | Where-Object { $_.StartsWith('P ') } | ForEach-Object { $_.Substring(2) } | Set-Content $greenTestsFilePath
 
           # Compare test file against previously committed file.
           $establishedGreenTestsFilePath = ".\test\EFCore.Jet.FunctionalTests\GreenTests\ace_${{ matrix.aceVersion }}_$('${{ matrix.dataAccessProviderType }}'.Replace(' ', '').ToLowerInvariant())_${{ matrix.aceArchitecture }}.txt"
@@ -320,24 +416,24 @@ jobs:
                   $notGreenAnymore
                   exit 1
               }
-          
+
               echo 'All tests that passed in previous runs still passed in this run.'
 
               $newlyGreenTests = $diffResult | Where-Object { $_.SideIndicator -eq '=>' } | Select-Object -ExpandProperty InputObject
               if ($newlyGreenTests.Length -gt 0) {
                 Copy-Item $greenTestsFilePath $establishedGreenTestsFilePath -Force -Verbose
-          
+
                 echo "`nThe following new tests passed that did not pass before:`n"
                 $newlyGreenTests
 
                 $commitGreenTestsFile = $establishedGreenTestsFilePath
                 echo "commitGreenTestsFile=$commitGreenTestsFile" >> $env:GITHUB_ENV
-            }
+              }
           }
           echo 'Check succeeded.'
       - name: 'Upload Green Tests'
         if: ${{ env.commitGreenTestsFile != '' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: green-tests_${{ env.matrixId }}
           path: ${{ env.commitGreenTestsFile }}
@@ -351,7 +447,7 @@ jobs:
     steps:
       - name: 'Check Test Results Artifacts'
         id: CheckTestResultsArtifacts
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -371,14 +467,14 @@ jobs:
       - name: 'Merge Test Results'
         id: MergeTestResults
         if: steps.CheckTestResultsArtifacts.outputs.artifactsAvailable == 'true'
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v6
         with:
           name: test-results
           pattern: test-results_*
           delete-merged: true
       - name: 'Check Green Tests Artifacts'
         id: CheckGreenTestsArtifacts
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -398,7 +494,7 @@ jobs:
       - name: 'Merge Green Tests'
         id: MergeGreenTests
         if: steps.CheckGreenTestsArtifacts.outputs.artifactsAvailable == 'true'
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v6
         with:
           name: green-tests
           pattern: green-tests_*
@@ -411,9 +507,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: global.json
       - name: .NET Information
@@ -491,7 +587,7 @@ jobs:
           echo "pushToMygetOrg=$pushToMygetOrg" >> $env:GITHUB_ENV
           echo "pushToNugetOrg=$pushToNugetOrg" >> $env:GITHUB_ENV
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: nupkgs
           path: nupkgs
diff --git a/.github/workflows/test_results.yml b/.github/workflows/test_results.yml
index bcad7a3e..7a7f13db 100644
--- a/.github/workflows/test_results.yml
+++ b/.github/workflows/test_results.yml
@@ -17,7 +17,7 @@ jobs:
         shell: bash
         run: |
           #
-          # The later used dorny/test-reporter@v1 action can throw the following exception when enough tests have been
+          # The later used dorny/test-reporter action can throw the following exception when enough tests have been
           # executed:
           #     RangeError: Maximum call stack size exceeded
           #
@@ -36,16 +36,15 @@ jobs:
           which node
           node --version
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ github.event.workflow_run.head_repository.full_name }}
           ref: ${{ github.event.workflow_run.head_branch }}
           fetch-depth: 1
-      # The dorny/test-reporter@v1 action doesn't support actions/upload-artifact@v4 yet.
-      # We therefore download the artifact manually and feed it to dorny/test-reporter@v1 as local files.
+      # Download the artifact manually and feed it to dorny/test-reporter as local files.
       - name: 'Download Test Results'
         id: DownloadTestResults
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -83,7 +82,7 @@ jobs:
           dir -Recurse | Select-Object -ExpandProperty FullName
       - name: 'Publish Test Report'
         if: steps.ExtractArtifact.conclusion == 'success'
-        uses: dorny/test-reporter@v1
+        uses: dorny/test-reporter@v3
         env:
           #
           # Can throw the following exception, when enough tests have been executed:
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 00000000..5282c5de
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,105 @@
+# AGENTS.md
+
+This file provides guidance to Codex (Codex.ai/code) when working with code in this repository.
+
+## What This Is
+
+EntityFrameworkCore.Jet is an EF Core provider for Microsoft Jet/ACE databases (Microsoft Access `.mdb`/`.accdb` files). It runs **Windows only** and bridges EF Core to the Access database engine via either ODBC or OLE DB.
+
+Current version: `10.0.x` targeting EF Core 10 and `net10.0`.
+
+## Build
+
+```powershell
+dotnet build EFCore.Jet.sln
+```
+
+Assemblies are **strong-name signed** using `Key.snk`. `TreatWarningsAsErrors=True` is set globally — fix all warnings.
+
+### Local EFCore Repository (optional)
+
+To develop against a local EF Core build instead of NuGet packages, copy `Development.props.sample` to `Development.props` and set `LocalEFCoreRepository` to your EF Core checkout. That local build must be compiled with `AssemblyVersion=10.0.0.0` to avoid binding conflicts.
+
+## Tests
+
+Tests require a real Microsoft Access driver installed (ODBC or OLE DB) and an actual `.accdb` file — no mocks. The connection string is configured via:
+- `test/EFCore.Jet.FunctionalTests/config.json` (OLE DB example present)
+- `test/EFCore.Jet.Tests/config.json` (bare filename; picks up default provider)
+- Or env var `EFCoreJet_DefaultConnection`
+
+**Run all tests** (requires x86 or x64 matching your driver bitness):
+
+```powershell
+dotnet test EFCore.Jet.sln --configuration Debug
+```
+
+**Run a single test class:**
+
+```powershell
+dotnet test test\EFCore.Jet.FunctionalTests\EFCore.Jet.FunctionalTests.csproj --filter "FullyQualifiedName~NorthwindQueryJetTest"
+```
+
+**Run a single test method:**
+
+```powershell
+dotnet test test\EFCore.Jet.FunctionalTests\EFCore.Jet.FunctionalTests.csproj --filter "FullyQualifiedName=EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindQueryJetTest.Where_simple"
+```
+
+Tests run in **fixed order by default** (`FIXED_TEST_ORDER` compile constant). All tests lock culture to `en-US` via a module initializer.
+
+Tests that require features Jet doesn't support are marked `[Fact(Skip = "Unsupported by JET: ...")]` — see `SkipMessages.txt` for the catalog of known unsupported patterns.
+
+## Project Structure
+
+```
+src/
+  EFCore.Jet.Data/      ADO.NET driver — JetConnection, JetCommand, JetDataReader,
+                        schema management, DUAL table simulation, connection pooling
+  EFCore.Jet/           EF Core provider — query pipeline, migrations, scaffolding,
+                        type mappings, value generation, conventions
+  EFCore.Jet.Odbc/      Provider factory for ODBC data access
+  EFCore.Jet.OleDb/     Provider factory for OLE DB data access
+  Shared/               Shared source files compiled into multiple src projects
+
+test/
+  EFCore.Jet.Data.Tests/          Unit tests for the ADO.NET driver layer
+  EFCore.Jet.FunctionalTests/     EF Core specification tests (adapted from EF Core's own suite)
+  EFCore.Jet.Tests/               Additional functional tests
+  EFCore.Jet.IntegrationTests/    Integration scenario tests
+  JetProviderExceptionTests/      Exception-path tests
+  Shared/               Shared test infrastructure (xunit framework customizations,
+                        test orderers, conditional test attributes)
+```
+
+## Architecture: Two-Layer Design
+
+**Layer 1 — `EFCore.Jet.Data`** wraps the raw ODBC/OLE DB driver:
+- `JetConnection` detects whether the connection string is ODBC or OLE DB and delegates to the appropriate inner `DbConnection`.
+- `JetCommand` rewrites SQL at runtime: handles `SELECT SKIP`, emulates `@@ROWCOUNT`, rewrites `TOP @param`, parses `IF NOT EXISTS ... THEN ...` syntax, and intercepts stored-procedure creation.
+- `JetConfiguration` holds global settings: `TimeSpanOffset` (Jet has no TimeSpan; dates are offset from 1899-12-30), `CustomDualTableName`, `IntegerNullValue`, `UseConnectionPooling`.
+- Schema operations (create/drop database, list tables) have three implementations: ADOX, DAO, and Precise, selected based on available COM libraries.
+
+**Layer 2 — `EFCore.Jet`** is the EF Core provider:
+- `JetServiceCollectionExtensions.AddEntityFrameworkJet()` registers all provider services.
+- `JetQuerySqlGenerator` extends `QuerySqlGenerator` to produce Jet-compatible SQL — converts `CAST` to Jet VBA functions (`CBOOL`, `CINT`, `CLNG`, etc.), handles boolean/numeric null semantics.
+- `JetQueryTranslationPostprocessor` applies Jet-specific query rewrites in order: skip/take transformation → base postprocessing → optional millisecond support → ORDER BY lifting. `JetSkipTakePostprocessor` emulates `SKIP`/`OFFSET` since Jet only supports `SELECT TOP n`.
+- `JetMigrationsSqlGenerator` generates DDL for Access (no `ALTER COLUMN`, limited constraint support).
+- `JetHistoryRepository` implements migration locking via a `__EFMigrationsLock` table with `LockReleaseBehavior.Explicit`.
+- `JetRelationalConnection` creates an "empty" (masterless) connection for database creation/drop operations.
+
+## Key Jet SQL Constraints
+
+These shape much of the query pipeline complexity:
+- No `OFFSET` — emulated via subquery or `TOP`+skip in the data layer
+- `SELECT TOP n` only supports a literal integer, not a parameter (rewritten at command level)
+- Subqueries in `SELECT` list are limited; scalar subqueries only work in `FROM`
+- No parallel transactions (OLE DB)
+- No millisecond precision in `DateTime`
+- `CROSS JOIN` and mixed `JOIN`/comma syntax must be ordered correctly
+- Booleans stored as `-1`/`0` (numeric), not `TRUE`/`FALSE`
+- `GUID` support is indirect
+- No `rowversion`, no `DateTimeOffset`, no nullable `BIT`
+
+## Versioning
+
+`Version.props` owns `VersionPrefix` and `PreReleaseVersionLabel`. Bump `VersionPrefix` after each release. Valid labels: `alpha`, `beta`, `silver`, `preview`, `rc`, `rtm`, `servicing`. CI sets `OfficialVersion`, `ContinuousIntegrationTimestamp`, and `BuildSha` automatically.
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000..0718af3d
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,105 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## What This Is
+
+EntityFrameworkCore.Jet is an EF Core provider for Microsoft Jet/ACE databases (Microsoft Access `.mdb`/`.accdb` files). It runs **Windows only** and bridges EF Core to the Access database engine via either ODBC or OLE DB.
+
+Current version: `10.0.x` targeting EF Core 10 and `net10.0`.
+
+## Build
+
+```powershell
+dotnet build EFCore.Jet.sln
+```
+
+Assemblies are **strong-name signed** using `Key.snk`. `TreatWarningsAsErrors=True` is set globally — fix all warnings.
+
+### Local EFCore Repository (optional)
+
+To develop against a local EF Core build instead of NuGet packages, copy `Development.props.sample` to `Development.props` and set `LocalEFCoreRepository` to your EF Core checkout. That local build must be compiled with `AssemblyVersion=10.0.0.0` to avoid binding conflicts.
+
+## Tests
+
+Tests require a real Microsoft Access driver installed (ODBC or OLE DB) and an actual `.accdb` file — no mocks. The connection string is configured via:
+- `test/EFCore.Jet.FunctionalTests/config.json` (OLE DB example present)
+- `test/EFCore.Jet.Tests/config.json` (bare filename; picks up default provider)
+- Or env var `EFCoreJet_DefaultConnection`
+
+**Run all tests** (requires x86 or x64 matching your driver bitness):
+
+```powershell
+dotnet test EFCore.Jet.sln --configuration Debug
+```
+
+**Run a single test class:**
+
+```powershell
+dotnet test test\EFCore.Jet.FunctionalTests\EFCore.Jet.FunctionalTests.csproj --filter "FullyQualifiedName~NorthwindQueryJetTest"
+```
+
+**Run a single test method:**
+
+```powershell
+dotnet test test\EFCore.Jet.FunctionalTests\EFCore.Jet.FunctionalTests.csproj --filter "FullyQualifiedName=EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindQueryJetTest.Where_simple"
+```
+
+Tests run in **fixed order by default** (`FIXED_TEST_ORDER` compile constant). All tests lock culture to `en-US` via a module initializer.
+
+Tests that require features Jet doesn't support are marked `[Fact(Skip = "Unsupported by JET: ...")]` — see `SkipMessages.txt` for the catalog of known unsupported patterns.
+
+## Project Structure
+
+```
+src/
+  EFCore.Jet.Data/      ADO.NET driver — JetConnection, JetCommand, JetDataReader,
+                        schema management, DUAL table simulation, connection pooling
+  EFCore.Jet/           EF Core provider — query pipeline, migrations, scaffolding,
+                        type mappings, value generation, conventions
+  EFCore.Jet.Odbc/      Provider factory for ODBC data access
+  EFCore.Jet.OleDb/     Provider factory for OLE DB data access
+  Shared/               Shared source files compiled into multiple src projects
+
+test/
+  EFCore.Jet.Data.Tests/          Unit tests for the ADO.NET driver layer
+  EFCore.Jet.FunctionalTests/     EF Core specification tests (adapted from EF Core's own suite)
+  EFCore.Jet.Tests/               Additional functional tests
+  EFCore.Jet.IntegrationTests/    Integration scenario tests
+  JetProviderExceptionTests/      Exception-path tests
+  Shared/               Shared test infrastructure (xunit framework customizations,
+                        test orderers, conditional test attributes)
+```
+
+## Architecture: Two-Layer Design
+
+**Layer 1 — `EFCore.Jet.Data`** wraps the raw ODBC/OLE DB driver:
+- `JetConnection` detects whether the connection string is ODBC or OLE DB and delegates to the appropriate inner `DbConnection`.
+- `JetCommand` rewrites SQL at runtime: handles `SELECT SKIP`, emulates `@@ROWCOUNT`, rewrites `TOP @param`, parses `IF NOT EXISTS ... THEN ...` syntax, and intercepts stored-procedure creation.
+- `JetConfiguration` holds global settings: `TimeSpanOffset` (Jet has no TimeSpan; dates are offset from 1899-12-30), `CustomDualTableName`, `IntegerNullValue`, `UseConnectionPooling`.
+- Schema operations (create/drop database, list tables) have three implementations: ADOX, DAO, and Precise, selected based on available COM libraries.
+
+**Layer 2 — `EFCore.Jet`** is the EF Core provider:
+- `JetServiceCollectionExtensions.AddEntityFrameworkJet()` registers all provider services.
+- `JetQuerySqlGenerator` extends `QuerySqlGenerator` to produce Jet-compatible SQL — converts `CAST` to Jet VBA functions (`CBOOL`, `CINT`, `CLNG`, etc.), handles boolean/numeric null semantics.
+- `JetQueryTranslationPostprocessor` applies Jet-specific query rewrites in order: skip/take transformation → base postprocessing → optional millisecond support → ORDER BY lifting. `JetSkipTakePostprocessor` emulates `SKIP`/`OFFSET` since Jet only supports `SELECT TOP n`.
+- `JetMigrationsSqlGenerator` generates DDL for Access (no `ALTER COLUMN`, limited constraint support).
+- `JetHistoryRepository` implements migration locking via a `__EFMigrationsLock` table with `LockReleaseBehavior.Explicit`.
+- `JetRelationalConnection` creates an "empty" (masterless) connection for database creation/drop operations.
+
+## Key Jet SQL Constraints
+
+These shape much of the query pipeline complexity:
+- No `OFFSET` — emulated via subquery or `TOP`+skip in the data layer
+- `SELECT TOP n` only supports a literal integer, not a parameter (rewritten at command level)
+- Subqueries in `SELECT` list are limited; scalar subqueries only work in `FROM`
+- No parallel transactions (OLE DB)
+- No millisecond precision in `DateTime`
+- `CROSS JOIN` and mixed `JOIN`/comma syntax must be ordered correctly
+- Booleans stored as `-1`/`0` (numeric), not `TRUE`/`FALSE`
+- `GUID` support is indirect
+- No `rowversion`, no `DateTimeOffset`, no nullable `BIT`
+
+## Versioning
+
+`Version.props` owns `VersionPrefix` and `PreReleaseVersionLabel`. Bump `VersionPrefix` after each release. Valid labels: `alpha`, `beta`, `silver`, `preview`, `rc`, `rtm`, `servicing`. CI sets `OfficialVersion`, `ContinuousIntegrationTimestamp`, and `BuildSha` automatically.
diff --git a/Dependencies.targets b/Dependencies.targets
index ebab4e47..62c772be 100644
--- a/Dependencies.targets
+++ b/Dependencies.targets
@@ -1,8 +1,8 @@
 <Project>
 	<PropertyGroup>
-		<DotNetVersion>[10.0.5,10.0.999]</DotNetVersion>
-		<EFCoreVersion>[10.0.5,10.0.999]</EFCoreVersion>
-		<MSLibVersion>[10.0.5,10.0.999]</MSLibVersion>
+		<DotNetVersion>[10.0.9,10.0.999]</DotNetVersion>
+		<EFCoreVersion>[10.0.9,10.0.999]</EFCoreVersion>
+		<MSLibVersion>[10.0.9,10.0.999]</MSLibVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -14,7 +14,7 @@
 		<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
 		<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(MSLibVersion)" />
 		<PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
-		<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.201" />
+		<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.300" />
 
 		<!-- EFCore.Jet -->
 		<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(MSLibVersion)" />
@@ -28,10 +28,10 @@
 		<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
 		<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
 		<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(MSLibVersion)" />
-		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="18.3.0" />
-		<PackageReference Update="MSTest.TestAdapter" Version="4.1.0" />
-		<PackageReference Update="MSTest.TestFramework" Version="4.1.0" />
-		<PackageReference Update="coverlet.collector" Version="8.0.1" />
+		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="18.7.0" />
+		<PackageReference Update="MSTest.TestAdapter" Version="4.2.3" />
+		<PackageReference Update="MSTest.TestFramework" Version="4.2.3" />
+		<PackageReference Update="coverlet.collector" Version="10.0.1" />
 		<PackageReference Update="Newtonsoft.Json" Version="13.0.4" />
 
 		<!-- EFCore.Jet.FunctionalTests -->
diff --git a/Version.props b/Version.props
index cb7abfa9..cf38442b 100644
--- a/Version.props
+++ b/Version.props
@@ -15,8 +15,8 @@
             Bump-up to the next iteration immediately after a release, so that subsequent daily builds are named
             correctly.
         -->
-		<VersionPrefix>10.0.0</VersionPrefix>
-		<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
+		<VersionPrefix>10.0.1</VersionPrefix>
+		<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
 		<PreReleaseVersionIteration>0</PreReleaseVersionIteration>
 
 		<!--
diff --git a/docs/README.md b/docs/README.md
index 7b60842f..1a9d9f3a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,15 +1,17 @@
 # EntityFrameworkCore.Jet
-[![Build status](https://github.com/CirrusRedOrg/EntityFrameworkCore.Jet/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/CirrusRedOrg/EntityFrameworkCore.Jet/actions/workflows/build.yml)
+[![Build status](https://github.com/CirrusRedOrg/EntityFrameworkCore.Jet/actions/workflows/push.yml/badge.svg?branch=master)](https://github.com/CirrusRedOrg/EntityFrameworkCore.Jet/actions/workflows/push.yml)
 [![Stable release feed for official builds](https://img.shields.io/nuget/vpre/EntityFrameworkCore.Jet.svg?style=flat-square&label=NuGet)](https://www.nuget.org/packages/EntityFrameworkCore.Jet/)
-[![Nightly build feed for release builds](https://img.shields.io/myget/cirrusred/vpre/EntityFrameworkCore.Jet.svg?label=Nightly)](https://www.myget.org/feed/cirrusred/package/nuget/EntityFrameworkCore.Jet)
-[![Nightly build feed for debugging enabled builds](https://img.shields.io/myget/cirrusred-debug/vpre/EntityFrameworkCore.Jet.svg?label=Debug)](https://www.myget.org/feed/cirrusred-debug/package/nuget/EntityFrameworkCore.Jet)
+[![CI build feed for release builds](https://img.shields.io/myget/cirrusred/vpre/EntityFrameworkCore.Jet.svg?label=CI%20Release)](https://www.myget.org/feed/cirrusred/package/nuget/EntityFrameworkCore.Jet)
+[![CI build feed for debugging enabled builds](https://img.shields.io/myget/cirrusred-debug/vpre/EntityFrameworkCore.Jet.svg?label=CI%20Debug)](https://www.myget.org/feed/cirrusred-debug/package/nuget/EntityFrameworkCore.Jet)
 
 `EntityFrameworkCore.Jet` is an Entity Framework Core provider for Microsoft Jet/ACE databases (supporting the Microsoft Access database file formats `MDB` and `ACCDB`).
 
 ## Compatibility Matrix
 
-| EntityFrameworkCore.Jet Version | EntityFrameworkCore Version | .NET (Core) | Notes |
+| EntityFrameworkCore.Jet Version | Entity Framework Core Version | .NET | Notes |
 | ------------- | ------------- | ------------- | ------------- |
+| 10.0.x | 10.0.x | 10.0+ | Current development line |
+| 9.0.x | 9.0.x | 9.0+ | Supported |
 | 8.0.x | 8.0.x | 8.0+ | Alpha 2 onwards is compatible with EF Core RTM |
 | 7.0.x | 7.0.x | 6.0+ |
 | 6.0.x | 6.0.x | 6.0+ |
@@ -17,12 +19,64 @@
 The major version corresponds to the major version of EF Core (i.e. EFCore.Jet `3.x` is compatible with EF Core `3.y`).
 It runs on Windows operating systems only and can be used with either ODBC or OLE DB together with their respective Access Database driver/provider.
 
+## Requirements
+
+`EntityFrameworkCore.Jet` requires:
+
+* Windows.
+* A Microsoft Access Database Engine driver/provider for either ODBC or OLE DB.
+* A process architecture (`x86` or `x64`) that matches the installed Access driver/provider.
+
+The provider works with Microsoft Access `MDB` and `ACCDB` database files.
+
 ## Packages
 
-* [EntityFrameworkCore.Jet](https://www.nuget.org/packages/EntityFrameworkCore.Jet/)
-* [EntityFrameworkCore.Jet.Data](https://www.nuget.org/packages/EntityFrameworkCore.Jet.Data/)
-* [EntityFrameworkCore.Jet.Odbc](https://www.nuget.org/packages/EntityFrameworkCore.Jet.Odbc/)
-* [EntityFrameworkCore.Jet.OleDb](https://www.nuget.org/packages/EntityFrameworkCore.Jet.OleDb/)
+* [EntityFrameworkCore.Jet](https://www.nuget.org/packages/EntityFrameworkCore.Jet/) - the EF Core provider.
+* [EntityFrameworkCore.Jet.Data](https://www.nuget.org/packages/EntityFrameworkCore.Jet.Data/) - the shared ADO.NET-style data access layer used by the provider packages.
+* [EntityFrameworkCore.Jet.Odbc](https://www.nuget.org/packages/EntityFrameworkCore.Jet.Odbc/) - ODBC support, including the `UseJetOdbc` extension method.
+* [EntityFrameworkCore.Jet.OleDb](https://www.nuget.org/packages/EntityFrameworkCore.Jet.OleDb/) - OLE DB support, including the `UseJetOleDb` extension method.
+
+## Getting Started
+
+Install the provider package for the data access technology you want to use:
+
+```powershell
+dotnet add package EntityFrameworkCore.Jet.OleDb
+```
+
+or:
+
+```powershell
+dotnet add package EntityFrameworkCore.Jet.Odbc
+```
+
+Configure your `DbContext` with the matching `UseJet...` extension method:
+
+```csharp
+using Microsoft.EntityFrameworkCore;
+
+public class BloggingContext : DbContext
+{
+    public DbSet<Blog> Blogs => Set<Blog>();
+
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        => optionsBuilder.UseJetOleDb(
+            @"Provider=Microsoft.ACE.OLEDB.12.0;Data Source=C:\Data\Blogging.accdb");
+}
+
+public class Blog
+{
+    public int Id { get; set; }
+    public string? Url { get; set; }
+}
+```
+
+For ODBC, use `UseJetOdbc` instead:
+
+```csharp
+optionsBuilder.UseJetOdbc(
+    @"Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=C:\Data\Blogging.accdb;");
+```
 
 ## NuGet Feeds
 
@@ -30,9 +84,9 @@ It runs on Windows operating systems only and can be used with either ODBC or OL
 
 All official releases are available on [nuget.org](https://www.nuget.org/packages/EntityFrameworkCore.Jet/).
 
-### Daily Builds
+### CI Builds
 
-To use the latest daily builds, add a `NuGet.config` file to your solution root, add the daily feeds you are interested in and enable _prereleases_:
+CI publishes each build to MyGet. To use the latest CI builds, add a `NuGet.config` file to your solution root, add the feeds you are interested in and enable _prereleases_:
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
@@ -45,7 +99,7 @@ To use the latest daily builds, add a `NuGet.config` file to your solution root,
 </configuration>
 ```
 
-There are two daily build feeds available, one with (optimized) `Release` configuration builds and one with (unoptimized) `Debug` configuration builds.
+There are two CI build feeds available, one with (optimized) `Release` configuration builds and one with (unoptimized) `Debug` configuration builds.
 All packages use SourceLink.
   
 ## Fluent API
@@ -62,4 +116,4 @@ More information can be found on our [Wiki](https://www.github.com/CirrusRedOrg/
 
 ## Questions
 
-Any questions about how to use `EntityFrameworkCore.Jet` can be ask on [StackOverflow](https://stackoverflow.com/) using the `jet-ef-provider` and `entity-framework-core` tags.
+Questions, bug reports, and feature requests can be opened as [GitHub issues](https://github.com/CirrusRedOrg/EntityFrameworkCore.Jet/issues).
diff --git a/global.json b/global.json
index 20008430..98c1f6d9 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.201",
+    "version": "10.0.300",
     "allowPrerelease": true,
     "rollForward": "latestFeature"
   }
diff --git a/src/EFCore.Jet.Data/JetCommand.cs b/src/EFCore.Jet.Data/JetCommand.cs
index 7a5240c3..6a83d462 100644
--- a/src/EFCore.Jet.Data/JetCommand.cs
+++ b/src/EFCore.Jet.Data/JetCommand.cs
@@ -77,6 +77,13 @@ protected override void Dispose(bool disposing)
 #endif
         }
 
+        private void ClearSplitCommandList()
+        {
+            foreach (var cmd in SplitCommandList)
+                if (cmd != this) cmd.Dispose();
+            SplitCommandList = [];
+        }
+
         internal DbCommand InnerCommand { get; }
 
         internal IList<JetCommand> SplitCommandList { get; set; } = [];
@@ -191,6 +198,7 @@ protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
 
             ExpandParameters();
 
+            ClearSplitCommandList();
             SplitCommandList = SplitCommands();
 
             for (var i = 0; i < SplitCommandList.Count - 1; i++)
@@ -245,6 +253,7 @@ public override int ExecuteNonQuery()
                 throw new InvalidOperationException(Messages.PropertyNotInitialized(nameof(Connection)));
 
             ExpandParameters();
+            ClearSplitCommandList();
             SplitCommandList = SplitCommands();
             return SplitCommandList
                 .Aggregate(0, (_, command) => command.ExecuteNonQueryCore());
@@ -333,6 +342,7 @@ public override object ExecuteScalar()
 
             ExpandParameters();
 
+            ClearSplitCommandList();
             SplitCommandList = SplitCommands();
 
             for (var i = 0; i < SplitCommandList.Count - 1; i++)
@@ -363,13 +373,16 @@ protected virtual object ExecuteScalarCore()
             if (JetInformationSchema.TryGetDataReaderFromInformationSchemaCommand(this, out var dataReader))
             {
                 // Retrieve from store schema definition.
-                if (dataReader.HasRows)
+                using (dataReader)
                 {
-                    dataReader.Read();
-                    return dataReader[0];
-                }
+                    if (dataReader.HasRows)
+                    {
+                        dataReader.Read();
+                        return dataReader[0];
+                    }
 
-                return DBNull.Value;
+                    return DBNull.Value;
+                }
             }
 
             FixupGlobalVariables();
@@ -529,7 +542,7 @@ protected virtual string FixupIdentity(string commandText)
             => FixupGlobalVariablePlaceholder(
                 commandText, "@@identity", (outerCommand, placeholder) =>
                 {
-                    var command = (DbCommand)((ICloneable)outerCommand.InnerCommand).Clone();
+                    using var command = (DbCommand)((ICloneable)outerCommand.InnerCommand).Clone();
                     command.CommandText = $"SELECT {placeholder}";
                     command.Parameters.Clear();
 
diff --git a/src/EFCore.Jet.Data/JetConnection.cs b/src/EFCore.Jet.Data/JetConnection.cs
index c7ef3ac1..e13d2b76 100644
--- a/src/EFCore.Jet.Data/JetConnection.cs
+++ b/src/EFCore.Jet.Data/JetConnection.cs
@@ -360,22 +360,17 @@ public override void Open()
             // It is possible, that a connection string was provided, that left out the actual ACE/Jet provider
             // information, but is in a distinctive style (ODBC or OLE DB) anyway.
             // In that case, we need to retrieving the data access provider type's most recent ACE/Jet provider.
-            var connectionStringBuilder = DataAccessProviderFactory.CreateConnectionStringBuilder();
-            connectionStringBuilder.ConnectionString = connectionString;
+            var connectionStringBuilder = CreateConnectionStringBuilderForNormalization(connectionString, dataAccessProviderType);
 
             if (connectionStringBuilder.Remove("IgnoreMsys"))
-            {
                 _ignoreMSys = true;
-                connectionString = connectionStringBuilder.ToString();
-            }
 
-            if (string.IsNullOrWhiteSpace(connectionStringBuilder.GetProvider()))
+            if (string.IsNullOrWhiteSpace(connectionStringBuilder.GetProvider(dataAccessProviderType)))
             {
                 var provider = GetMostRecentCompatibleProviders(dataAccessProviderType)
                     .FirstOrDefault()
                     .Key ?? throw new InvalidOperationException($"Unable to find any compatible {Enum.GetName(typeof(DataAccessProviderType), dataAccessProviderType)} provider for the connection string: {fileNameOrConnectionString}");
-                connectionStringBuilder.SetProvider(provider);
-                connectionString = connectionStringBuilder.ToString();
+                connectionStringBuilder.SetProvider(provider, dataAccessProviderType);
             }
 
             // Enable ExtendedAnsiSQL when using ODBC to support ODBC 4.0 statements (like CREATE VIEW).
@@ -384,11 +379,13 @@ public override void Open()
                 if (!connectionStringBuilder.ContainsKey("ExtendedAnsiSQL"))
                 {
                     connectionStringBuilder["ExtendedAnsiSQL"] = 1;
-                    connectionString = connectionStringBuilder.ToString();
                 }
             }
 
-            connectionString = ExpandDatabaseFilePath(connectionString, DataAccessProviderFactory);
+            connectionStringBuilder.SetDataSource(
+                JetStoreDatabaseHandling.ExpandFileName(connectionStringBuilder.GetDataSource(dataAccessProviderType)),
+                dataAccessProviderType);
+            connectionString = RebuildConnectionString(connectionStringBuilder, dataAccessProviderType, DataAccessProviderFactory);
 
             try
             {
@@ -442,8 +439,8 @@ public bool TableExists(string tableName)
 
             try
             {
-                CreateCommand($"select count(*) from `{tableName}` where 1=2")
-                    .ExecuteNonQuery();
+                using var command = CreateCommand($"select count(*) from `{tableName}` where 1=2");
+                command.ExecuteNonQuery();
                 tableExists = true;
             }
             catch
@@ -483,9 +480,10 @@ public DbCommand CreateCommand(string? commandText, int? commandTimeout = null)
         /// </returns>
         object ICloneable.Clone()
         {
-            var clone = new JetConnection();
+            var clone = new JetConnection(_connectionString, JetFactory?.InnerFactory);
+            clone.IsEmpty = IsEmpty;
             if (InnerConnection != null)
-                clone.InnerConnection = InnerConnectionFactory.Instance.OpenConnection(_connectionString, JetFactory.InnerFactory);
+                clone.Open();
             return clone;
         }
 
@@ -595,11 +593,81 @@ public static string GetConnectionString(string provider, string fileName, DataA
 
         private static string ExpandDatabaseFilePath(string connectionString, DbProviderFactory dataAccessProviderFactory)
         {
-            var connectionStringBuilder = dataAccessProviderFactory.CreateConnectionStringBuilder();
-            connectionStringBuilder.ConnectionString = connectionString;
-            connectionStringBuilder.SetDataSource(JetStoreDatabaseHandling.ExpandFileName(connectionStringBuilder.GetDataSource()));
+            var providerType = GetDataAccessProviderType(dataAccessProviderFactory);
+            var connectionStringBuilder = CreateConnectionStringBuilderForNormalization(connectionString, providerType);
+            connectionStringBuilder.SetDataSource(
+                JetStoreDatabaseHandling.ExpandFileName(connectionStringBuilder.GetDataSource(providerType)),
+                providerType);
+
+            return RebuildConnectionString(connectionStringBuilder, providerType, dataAccessProviderFactory);
+        }
+
+        private static DbConnectionStringBuilder CreateConnectionStringBuilderForNormalization(
+            string connectionString,
+            DataAccessProviderType providerType)
+            => new(providerType == DataAccessProviderType.Odbc)
+            {
+                ConnectionString = NormalizeConnectionStringForBuilder(connectionString, providerType)
+            };
+
+        private static string RebuildConnectionString(
+            DbConnectionStringBuilder sourceBuilder,
+            DataAccessProviderType providerType,
+            DbProviderFactory dataAccessProviderFactory)
+        {
+            var targetBuilder = providerType == DataAccessProviderType.OleDb
+                ? new JetConnectionStringBuilder(providerType)
+                : dataAccessProviderFactory.CreateConnectionStringBuilder();
+
+            foreach (string key in sourceBuilder.Keys)
+            {
+                if (providerType == DataAccessProviderType.Odbc &&
+                    string.Equals(key, "Driver", StringComparison.OrdinalIgnoreCase))
+                {
+                    targetBuilder.SetProvider(NormalizeOdbcDriverValue(sourceBuilder[key]?.ToString()), providerType);
+                    continue;
+                }
+
+                if (string.Equals(key, "Provider", StringComparison.OrdinalIgnoreCase))
+                {
+                    targetBuilder.SetProvider(sourceBuilder[key]?.ToString()!, providerType);
+                    continue;
+                }
+
+                if (string.Equals(key, "Data Source", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(key, "DBQ", StringComparison.OrdinalIgnoreCase))
+                {
+                    targetBuilder.SetDataSource(sourceBuilder[key]?.ToString()!, providerType);
+                    continue;
+                }
+
+                targetBuilder[key] = sourceBuilder[key];
+            }
+
+            return targetBuilder.ToString();
+        }
+
+        private static string NormalizeConnectionStringForBuilder(string connectionString, DataAccessProviderType providerType)
+            => providerType == DataAccessProviderType.Odbc
+                ? Regex.Replace(
+                    connectionString,
+                    @"(^|;)(\s*driver\s*=\s*)[""'](?<driver>\{[^;]*\})[""'](?=\s*(?:;|$))",
+                    "$1$2${driver}",
+                    RegexOptions.IgnoreCase)
+                : connectionString;
+
+        private static string NormalizeOdbcDriverValue(string? driver)
+        {
+            driver = driver?.Trim() ?? string.Empty;
+
+            if (driver.Length >= 2 &&
+                ((driver[0] == '"' && driver[^1] == '"') ||
+                 (driver[0] == '\'' && driver[^1] == '\'')))
+            {
+                driver = driver[1..^1];
+            }
 
-            return connectionStringBuilder.ToString();
+            return driver.TrimStart('{').TrimEnd('}');
         }
 
         public void DropDatabase()
@@ -804,4 +872,4 @@ public static bool IsFileName(string? fileNameOrConnectionString)
         [GeneratedRegex(@"^(?:.*;)?\s*Provider\s*=\s*\w+", RegexOptions.IgnoreCase, "en-AU")]
         private static partial Regex IsOleDbRegex();
     }
-}
\ No newline at end of file
+}
diff --git a/src/EFCore.Jet.Data/JetDataReader.cs b/src/EFCore.Jet.Data/JetDataReader.cs
index 483018eb..bed80af9 100644
--- a/src/EFCore.Jet.Data/JetDataReader.cs
+++ b/src/EFCore.Jet.Data/JetDataReader.cs
@@ -3,7 +3,6 @@
 using System.Data.Common;
 using System.Globalization;
 using System.IO;
-using System.Runtime.InteropServices.JavaScript;
 using System.Text;
 using System.Threading;
 
@@ -34,9 +33,12 @@ public JetDataReader(DbDataReader dataReader, int skipCount)
         }
 
         private readonly DbDataReader _wrappedDataReader;
+        private bool _isClosed;
 
         public override void Close()
         {
+            if (_isClosed) return;
+            _isClosed = true;
             _wrappedDataReader.Close();
 #if DEBUG
             Interlocked.Decrement(ref _activeObjectsCount);
@@ -311,12 +313,27 @@ public override Guid GetGuid(int ordinal)
         {
             // Fix for discussion https://jetentityframeworkprovider.codeplex.com/discussions/647028
             var value = _wrappedDataReader.GetValue(ordinal);
-            return JetConfiguration.UseDefaultValueOnDBNullConversionError &&
-                   Convert.IsDBNull(value)
-                ? Guid.Empty
-                : value is byte[] bytes
-                    ? new Guid(bytes)
-                    : (Guid)value;
+            if (JetConfiguration.UseDefaultValueOnDBNullConversionError &&
+                Convert.IsDBNull(value))
+            {
+                return default;
+            }
+            if (value is byte[] bytes)
+            {
+                return new Guid(bytes);
+            }
+            try
+            {
+                return (Guid)value;
+            }
+            catch
+            {
+                if (value is string s)
+                {
+                    return new Guid(s);
+                }
+            }
+            return (Guid)value;
         }
 
         public override short GetInt16(int ordinal)
@@ -541,6 +558,10 @@ public override T GetFieldValue<T>(int ordinal)
             {
                 return (T)(object)GetDateTimeOffset(ordinal);
             }
+            if (typeof(T) == typeof(Guid))
+            {
+                return (T)(object)GetGuid(ordinal);
+            }
 
             return (T)GetValue(ordinal);
         }
@@ -551,9 +572,6 @@ protected override void Dispose(bool disposing)
             {
                 _wrappedDataReader.Dispose();
             }
-#if DEBUG
-            Interlocked.Decrement(ref _activeObjectsCount);
-#endif
             base.Dispose(disposing);
         }
     }
diff --git a/src/EFCore.Jet.Data/JetStoreSchemaDefinition/JetStoreDatabaseHandling.cs b/src/EFCore.Jet.Data/JetStoreSchemaDefinition/JetStoreDatabaseHandling.cs
index 114fba82..0e63024d 100644
--- a/src/EFCore.Jet.Data/JetStoreSchemaDefinition/JetStoreDatabaseHandling.cs
+++ b/src/EFCore.Jet.Data/JetStoreSchemaDefinition/JetStoreDatabaseHandling.cs
@@ -213,6 +213,7 @@ public static void DeleteFile(string fileName)
             JetConnection.ClearAllPools();
 
             fileName = ExpandFileName(fileName);
+            ValidateDatabaseFileExtension(fileName);
             
             var directoryPath = Path.GetDirectoryName(fileName) ?? string.Empty;
             var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName);
@@ -240,6 +241,17 @@ public static void DeleteFile(string fileName)
             }
         }
 
+        private static void ValidateDatabaseFileExtension(string fileName)
+        {
+            var extension = Path.GetExtension(fileName);
+            if (!string.Equals(extension, ".accdb", StringComparison.OrdinalIgnoreCase) &&
+                !string.Equals(extension, ".mdb", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new InvalidOperationException(
+                    $"Only .accdb and .mdb database files can be dropped. The supplied path has extension '{extension}'.");
+            }
+        }
+
         private static string UnescapeSingleQuotes(string value)
             => value.Replace("''", "'");
 
@@ -273,4 +285,4 @@ public static string EnsureFileExtension(string fileName)
             return fileName;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/EFCore.Jet.Data/JetTransaction.cs b/src/EFCore.Jet.Data/JetTransaction.cs
index 02e155f3..b7588cfa 100644
--- a/src/EFCore.Jet.Data/JetTransaction.cs
+++ b/src/EFCore.Jet.Data/JetTransaction.cs
@@ -67,6 +67,8 @@ protected override void Dispose(bool disposing)
             }
             finally
             {
+                if (disposing)
+                    WrappedTransaction.Dispose();
                 _disposed = true;
                 _connection = null;
 
diff --git a/src/EFCore.Jet/Design/Internal/JetCSharpRuntimeAnnotationCodeGenerator.cs b/src/EFCore.Jet/Design/Internal/JetCSharpRuntimeAnnotationCodeGenerator.cs
new file mode 100644
index 00000000..becfb83c
--- /dev/null
+++ b/src/EFCore.Jet/Design/Internal/JetCSharpRuntimeAnnotationCodeGenerator.cs
@@ -0,0 +1,155 @@
+using EntityFrameworkCore.Jet.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Design.Internal;
+
+namespace EntityFrameworkCore.Jet.Design.Internal;
+
+/// <summary>
+///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+///     any release. You should only use it directly in your code with extreme caution and knowing that
+///     doing so can result in application failures when updating to a new Entity Framework Core release.
+/// </summary>
+#pragma warning disable EF1001 // Internal EF Core API usage.
+public class JetCSharpRuntimeAnnotationCodeGenerator : RelationalCSharpRuntimeAnnotationCodeGenerator
+{
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    public JetCSharpRuntimeAnnotationCodeGenerator(
+        CSharpRuntimeAnnotationCodeGeneratorDependencies dependencies,
+        RelationalCSharpRuntimeAnnotationCodeGeneratorDependencies relationalDependencies)
+        : base(dependencies, relationalDependencies)
+    {
+    }
+
+    /// <inheritdoc />
+    public override void Generate(IModel model, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+        }
+
+        base.Generate(model, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(IRelationalModel model, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+        }
+
+        base.Generate(model, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(IProperty property, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        /*if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+
+            if (!annotations.ContainsKey(JetAnnotationNames.ValueGenerationStrategy))
+            {
+                annotations[JetAnnotationNames.ValueGenerationStrategy] = property.GetValueGenerationStrategy();
+            }
+        }*/
+
+        base.Generate(property, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(IColumn column, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+        }
+
+        base.Generate(column, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(IIndex index, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+            annotations.Remove(JetAnnotationNames.Include);
+        }
+
+        base.Generate(index, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(ITableIndex index, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+            annotations.Remove(JetAnnotationNames.Include);
+        }
+
+        base.Generate(index, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(IKey key, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+        }
+
+        base.Generate(key, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(IUniqueConstraint uniqueConstraint, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+        }
+
+        base.Generate(uniqueConstraint, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(IEntityType entityType, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+        }
+
+        base.Generate(entityType, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(ITable table, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+        }
+
+        base.Generate(table, parameters);
+    }
+
+    /// <inheritdoc />
+    public override void Generate(IRelationalPropertyOverrides overrides, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
+    {
+        if (!parameters.IsRuntime)
+        {
+            var annotations = parameters.Annotations;
+        }
+
+        base.Generate(overrides, parameters);
+    }
+}
diff --git a/src/EFCore.Jet/Design/Internal/JetDesignTimeServices.cs b/src/EFCore.Jet/Design/Internal/JetDesignTimeServices.cs
index d37e5ba2..b6cc6c3a 100644
--- a/src/EFCore.Jet/Design/Internal/JetDesignTimeServices.cs
+++ b/src/EFCore.Jet/Design/Internal/JetDesignTimeServices.cs
@@ -1,6 +1,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using EntityFrameworkCore.Jet.Scaffolding.Internal;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 
 namespace EntityFrameworkCore.Jet.Design.Internal
 {
@@ -24,6 +25,7 @@ public virtual void ConfigureDesignTimeServices(IServiceCollection serviceCollec
 #pragma warning disable EF1001 // Internal EF Core API usage.
             new EntityFrameworkRelationalDesignServicesBuilder(serviceCollection)
                 .TryAdd<IAnnotationCodeGenerator, JetAnnotationCodeGenerator>()
+                .TryAdd<ICSharpRuntimeAnnotationCodeGenerator, JetCSharpRuntimeAnnotationCodeGenerator>()
 #pragma warning restore EF1001 // Internal EF Core API usage.
                 .TryAdd<IDatabaseModelFactory, JetDatabaseModelFactory>()
                 .TryAdd<IProviderConfigurationCodeGenerator, JetCodeGenerator>()
diff --git a/src/EFCore.Jet/EFCore.Jet.csproj b/src/EFCore.Jet/EFCore.Jet.csproj
index 50c7a18d..a3714c47 100644
--- a/src/EFCore.Jet/EFCore.Jet.csproj
+++ b/src/EFCore.Jet/EFCore.Jet.csproj
@@ -16,8 +16,8 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-rc.2.*" PrivateAssets="none" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-rc.2.*" PrivateAssets="none" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" PrivateAssets="none" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" PrivateAssets="none" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
diff --git a/src/EFCore.Jet/Extensions/JetPropertyExtensions.cs b/src/EFCore.Jet/Extensions/JetPropertyExtensions.cs
index 472a3f39..404ba8dd 100644
--- a/src/EFCore.Jet/Extensions/JetPropertyExtensions.cs
+++ b/src/EFCore.Jet/Extensions/JetPropertyExtensions.cs
@@ -18,6 +18,10 @@ public static class JetPropertyExtensions
         /// <returns> The identity seed. </returns>
         public static int? GetJetIdentitySeed(this IReadOnlyProperty property)
         {
+            if (property.DeclaringType.Model is RuntimeModel)
+            {
+                throw new InvalidOperationException(CoreStrings.RuntimeModelMissingData);
+            }
             var annotation = property.FindAnnotation(JetAnnotationNames.IdentitySeed);
             return (int?)annotation?.Value;
         }
@@ -172,8 +176,14 @@ public static void SetJetIdentitySeed(this IMutableRelationalPropertyOverrides o
         /// <param name="property"> The property. </param>
         /// <returns> The identity increment. </returns>
         public static int? GetJetIdentityIncrement(this IReadOnlyProperty property)
-            => (int?)property[JetAnnotationNames.IdentityIncrement]
+        {
+            if (property.DeclaringType.Model is RuntimeModel)
+            {
+                throw new InvalidOperationException(CoreStrings.RuntimeModelMissingData);
+            }
+            return (int?)property[JetAnnotationNames.IdentityIncrement]
                 ?? property.DeclaringType.Model.GetJetIdentityIncrement();
+        }
 
         /// <summary>
         ///     Returns the identity increment.
@@ -314,16 +324,18 @@ public static JetValueGenerationStrategy GetValueGenerationStrategy(this IReadOn
                 return (JetValueGenerationStrategy?)annotation.Value ?? JetValueGenerationStrategy.None;
             }
 
+            var defaultValueGenerationStrategy = GetDefaultValueGenerationStrategy(property);
+
             if (property.ValueGenerated != ValueGenerated.OnAdd
                 || property.IsForeignKey()
                 || property.TryGetDefaultValue(out _)
-                || property.GetDefaultValueSql() != null
+                || (defaultValueGenerationStrategy != JetValueGenerationStrategy.Sequence && property.GetDefaultValueSql() != null)
                 || property.GetComputedColumnSql() != null)
             {
                 return JetValueGenerationStrategy.None;
             }
 
-            return GetDefaultValueGenerationStrategy(property);
+            return defaultValueGenerationStrategy;
         }
         /// <summary>
         ///     <para>
@@ -364,16 +376,15 @@ internal static JetValueGenerationStrategy GetValueGenerationStrategy(
             if (sharedTableRootProperty != null)
             {
                 return sharedTableRootProperty.GetValueGenerationStrategy(storeObject, typeMappingSource)
-                       == JetValueGenerationStrategy.IdentityColumn
-                       && table.StoreObjectType == StoreObjectType.Table
-                       && !property.GetContainingForeignKeys().Any(
-                           fk =>
-                               !fk.IsBaseLinking()
-                               || (StoreObjectIdentifier.Create(fk.PrincipalEntityType, StoreObjectType.Table)
-                                       is StoreObjectIdentifier principal
-                                   && fk.GetConstraintName(table, principal) != null))
-                    ? JetValueGenerationStrategy.IdentityColumn
-                    : JetValueGenerationStrategy.None;
+                    == JetValueGenerationStrategy.IdentityColumn
+                    && table.StoreObjectType == StoreObjectType.Table
+                    && !property.GetContainingForeignKeys().Any(fk =>
+                        !fk.IsBaseLinking()
+                        || (StoreObjectIdentifier.Create(fk.PrincipalEntityType, StoreObjectType.Table)
+                                is { } principal
+                            && fk.GetConstraintName(table, principal) != null))
+                        ? JetValueGenerationStrategy.IdentityColumn
+                        : JetValueGenerationStrategy.None;
             }
 
             if (property.ValueGenerated != ValueGenerated.OnAdd
@@ -382,12 +393,11 @@ is StoreObjectIdentifier principal
                 || property.GetDefaultValueSql(storeObject) != null
                 || property.GetComputedColumnSql(storeObject) != null
                 || property.GetContainingForeignKeys()
-                    .Any(
-                        fk =>
-                            !fk.IsBaseLinking()
-                            || (StoreObjectIdentifier.Create(fk.PrincipalEntityType, StoreObjectType.Table)
-                                    is StoreObjectIdentifier principal
-                                && fk.GetConstraintName(table, principal) != null)))
+                    .Any(fk =>
+                        !fk.IsBaseLinking()
+                        || (StoreObjectIdentifier.Create(fk.PrincipalEntityType, StoreObjectType.Table)
+                                is { } principal
+                            && fk.GetConstraintName(table, principal) != null)))
             {
                 return JetValueGenerationStrategy.None;
             }
@@ -414,6 +424,19 @@ private static JetValueGenerationStrategy GetDefaultValueGenerationStrategy(IRea
                     : JetValueGenerationStrategy.None;
         }
 
+        /// <summary>
+        ///     Returns the <see cref="JetValueGenerationStrategy" /> to use for the property.
+        /// </summary>
+        /// <remarks>
+        ///     If no strategy is set for the property, then the strategy to use will be taken from the <see cref="IModel" />.
+        /// </remarks>
+        /// <param name="overrides">The property overrides.</param>
+        /// <returns>The strategy, or <see cref="JetValueGenerationStrategy.None" /> if none was set.</returns>
+        public static JetValueGenerationStrategy? GetValueGenerationStrategy(
+            this IReadOnlyRelationalPropertyOverrides overrides)
+            => (JetValueGenerationStrategy?)overrides.FindAnnotation(JetAnnotationNames.ValueGenerationStrategy)
+                ?.Value;
+
         private static JetValueGenerationStrategy GetDefaultValueGenerationStrategy(
             IReadOnlyProperty property,
             in StoreObjectIdentifier storeObject,
@@ -426,7 +449,7 @@ private static JetValueGenerationStrategy GetDefaultValueGenerationStrategy(
                 ? property.DeclaringType.GetMappingStrategy() == RelationalAnnotationNames.TpcMappingStrategy
                     ? JetValueGenerationStrategy.None
                     : JetValueGenerationStrategy.IdentityColumn
-                : JetValueGenerationStrategy.None;
+                    : JetValueGenerationStrategy.None;
         }
 
         /// <summary>
@@ -522,12 +545,12 @@ public static void SetValueGenerationStrategy(
         public static bool IsCompatibleWithValueGeneration(IReadOnlyProperty property)
         {
             var valueConverter = property.GetValueConverter()
-                                 ?? property.FindTypeMapping()?.Converter;
+                ?? property.FindTypeMapping()?.Converter;
 
             var type = (valueConverter?.ProviderClrType ?? property.ClrType).UnwrapNullableType();
             return type.IsInteger()
-                   || type.IsEnum
-                   || type == typeof(decimal);
+                || type.IsEnum
+                || type == typeof(decimal);
         }
 
         private static bool IsCompatibleWithValueGeneration(
diff --git a/src/EFCore.Jet/Extensions/JetServiceCollectionExtensions.cs b/src/EFCore.Jet/Extensions/JetServiceCollectionExtensions.cs
index c84fffb5..34909ea3 100644
--- a/src/EFCore.Jet/Extensions/JetServiceCollectionExtensions.cs
+++ b/src/EFCore.Jet/Extensions/JetServiceCollectionExtensions.cs
@@ -53,6 +53,7 @@ public static IServiceCollection AddEntityFrameworkJet(this IServiceCollection s
                 .TryAdd<IQuerySqlGeneratorFactory, JetQuerySqlGeneratorFactory>()
                 .TryAdd<IRelationalSqlTranslatingExpressionVisitorFactory, JetSqlTranslatingExpressionVisitorFactory>()
                 .TryAdd<ISqlExpressionFactory, JetSqlExpressionFactory>()
+                .TryAdd<IQueryTranslationPreprocessorFactory, JetQueryTranslationPreprocessorFactory>()
                 .TryAdd<IQueryTranslationPostprocessorFactory, JetQueryTranslationPostprocessorFactory>()
                 .TryAdd<IRelationalTransactionFactory, JetTransactionFactory>()
                 .TryAdd<IRelationalParameterBasedSqlProcessorFactory, JetParameterBasedSqlProcessorFactory>()
diff --git a/src/EFCore.Jet/Metadata/Conventions/JetValueGenerationStrategyConvention.cs b/src/EFCore.Jet/Metadata/Conventions/JetValueGenerationStrategyConvention.cs
index 147fadd5..228ffdac 100644
--- a/src/EFCore.Jet/Metadata/Conventions/JetValueGenerationStrategyConvention.cs
+++ b/src/EFCore.Jet/Metadata/Conventions/JetValueGenerationStrategyConvention.cs
@@ -1,6 +1,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Metadata.Internal;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore.Metadata.Conventions
@@ -75,6 +76,10 @@ public virtual void ProcessModelFinalizing(
                         property.Builder.HasValueGenerationStrategy(strategy);
                     }
                 }
+
+                // Complex type properties can never be identity columns; annotate them with None so
+                // the compiled model and runtime model both carry the annotation for comparison.
+                SetComplexTypePropertyStrategies(entityType);
             }
 
             static bool IsStrategyNoneNeeded(IReadOnlyProperty property, StoreObjectIdentifier storeObject)
@@ -88,12 +93,32 @@ static bool IsStrategyNoneNeeded(IReadOnlyProperty property, StoreObjectIdentifi
                     var providerClrType = (property.GetValueConverter() ?? property.FindRelationalTypeMapping(storeObject)?.Converter)
                         ?.ProviderClrType.UnwrapNullableType();
 
-                    return providerClrType != null
-                        && (providerClrType.IsInteger() || providerClrType == typeof(decimal));
+                    // Fall back to property CLR type when there is no converter (e.g. long? with no HasConversion).
+                    // Type mappings may not yet be applied during ProcessModelFinalizing, so FindRelationalTypeMapping
+                    // returns null and providerClrType would be null even for integer-CLR-typed properties.
+                    var clrType = providerClrType ?? property.ClrType.UnwrapNullableType();
+                    return clrType.IsInteger() || clrType == typeof(decimal);
                 }
 
                 return false;
             }
+
+            static void SetComplexTypePropertyStrategies(IConventionTypeBase typeBase)
+            {
+                foreach (var complexProperty in typeBase.GetComplexProperties())
+                {
+                    var complexType = complexProperty.ComplexType;
+                    foreach (var property in complexType.GetDeclaredProperties())
+                    {
+                        var declaringTable = property.GetMappedStoreObjects(StoreObjectType.Table).FirstOrDefault();
+                        if (declaringTable.Name != null)
+                        {
+                            property.SetAnnotation(JetAnnotationNames.ValueGenerationStrategy, JetValueGenerationStrategy.None, false);
+                        }
+                    }
+                    SetComplexTypePropertyStrategies(complexType);
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/EFCore.Jet/Metadata/Internal/JetAnnotationProvider.cs b/src/EFCore.Jet/Metadata/Internal/JetAnnotationProvider.cs
index ce65f51d..2e1c26d5 100644
--- a/src/EFCore.Jet/Metadata/Internal/JetAnnotationProvider.cs
+++ b/src/EFCore.Jet/Metadata/Internal/JetAnnotationProvider.cs
@@ -64,12 +64,6 @@ public override IEnumerable<IAnnotation> For(ITableIndex index, bool designTime)
         /// </summary>
         public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
         {
-            //Need to do this in both design and runtime
-            if (!designTime)
-            {
-                yield break;
-            }
-
             var table = StoreObjectIdentifier.Table(column.Table.Name, column.Table.Schema);
             var property = column.PropertyMappings
                 .Select(m => m.Property)
@@ -78,8 +72,22 @@ public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
                          == JetValueGenerationStrategy.IdentityColumn);
             if (property != null)
             {
-                var seed = property.GetJetIdentitySeed(table);
-                var increment = property.GetJetIdentityIncrement(table);
+                // RuntimeProperty (compiled model) throws on the table-specific overloads since
+                // per-table overrides aren't stored in the compiled model; fall back to model-level
+                // using direct annotation access to avoid the RuntimeModel guards on the extensions.
+                int? seed, increment;
+                if (property is RuntimeProperty)
+                {
+                    seed = (int?)property[JetAnnotationNames.IdentitySeed]
+                        ?? property.DeclaringType.Model.GetJetIdentitySeed();
+                    increment = (int?)property[JetAnnotationNames.IdentityIncrement]
+                        ?? property.DeclaringType.Model.GetJetIdentityIncrement();
+                }
+                else
+                {
+                    seed = property.GetJetIdentitySeed(table);
+                    increment = property.GetJetIdentityIncrement(table);
+                }
 
                 yield return new Annotation(
                     JetAnnotationNames.Identity,
diff --git a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetDateOnlyMethodTranslator.cs b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetDateOnlyMethodTranslator.cs
index 12bf624a..a5755c9d 100644
--- a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetDateOnlyMethodTranslator.cs
+++ b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetDateOnlyMethodTranslator.cs
@@ -58,21 +58,31 @@ private static readonly MethodInfo ToDateTimeMethodInfo
                     return null;
                 }
 
-                return _sqlExpressionFactory.Function(
-                    "DATETIME2FROMPARTS",
-                    [
-                        MapDatePartExpression("yyyy", instance),
-                        MapDatePartExpression("m", instance),
-                        MapDatePartExpression("d", instance),
-                        MapDatePartExpression("h", timeOnly),
-                        MapDatePartExpression("n", timeOnly),
-                        MapDatePartExpression("s", timeOnly),
-                        MapDatePartExpression("fraction", timeOnly),
-                        _sqlExpressionFactory.Constant(7, typeof(int)),
-                    ],
-                    nullable: true,
-                    argumentsPropagateNullability: [true, true, true, true, true, true, true, false],
-                    typeof(DateTime));
+                var datePart1 =
+                    _sqlExpressionFactory.Function(
+                        "DateSerial",
+                        [
+                            MapDatePartExpression("yyyy", instance),
+                            MapDatePartExpression("m", instance),
+                            MapDatePartExpression("d", instance)
+                        ],
+                        nullable: true,
+                        argumentsPropagateNullability: [true, true, true],
+                        typeof(DateTime));
+
+                var timePart =
+                    _sqlExpressionFactory.Function(
+                        "TimeSerial",
+                        [
+                            MapDatePartExpression("h", timeOnly),
+                            MapDatePartExpression("n", timeOnly),
+                            MapDatePartExpression("s", timeOnly)
+                        ],
+                        nullable: true,
+                        argumentsPropagateNullability: [true, true, true],
+                        typeof(DateTime));
+
+                return _sqlExpressionFactory.Add(datePart1, timePart);
             }
 
             if (_methodInfoDatePartMapping.TryGetValue(method, out var datePart))
diff --git a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetDateTimeMethodTranslator.cs b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetDateTimeMethodTranslator.cs
index ccd4dc33..77f05b76 100644
--- a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetDateTimeMethodTranslator.cs
+++ b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetDateTimeMethodTranslator.cs
@@ -20,14 +20,14 @@ public class JetDateTimeMethodTranslator(ISqlExpressionFactory sqlExpressionFact
             {typeof(DateTime).GetRuntimeMethod(nameof(DateTime.AddHours), [typeof(double)])!, "h"},
             {typeof(DateTime).GetRuntimeMethod(nameof(DateTime.AddMinutes), [typeof(double)])!, "n"},
             {typeof(DateTime).GetRuntimeMethod(nameof(DateTime.AddSeconds), [typeof(double)])!, "s"},
-            {typeof(DateTime).GetRuntimeMethod(nameof(DateTime.AddMilliseconds), [typeof(double)])!, "millisecond"},
+            //{typeof(DateTime).GetRuntimeMethod(nameof(DateTime.AddMilliseconds), [typeof(double)])!, "millisecond"},
             {typeof(DateTimeOffset).GetRuntimeMethod(nameof(DateTimeOffset.AddYears), [typeof(int)])!, "yyyy"},
             {typeof(DateTimeOffset).GetRuntimeMethod(nameof(DateTimeOffset.AddMonths), [typeof(int)])!, "m"},
             {typeof(DateTimeOffset).GetRuntimeMethod(nameof(DateTimeOffset.AddDays), [typeof(double)])!, "d"},
             {typeof(DateTimeOffset).GetRuntimeMethod(nameof(DateTimeOffset.AddHours), [typeof(double)])!, "h"},
             {typeof(DateTimeOffset).GetRuntimeMethod(nameof(DateTimeOffset.AddMinutes), [typeof(double)])!, "n"},
             {typeof(DateTimeOffset).GetRuntimeMethod(nameof(DateTimeOffset.AddSeconds), [typeof(double)])!, "s"},
-            {typeof(DateTimeOffset).GetRuntimeMethod(nameof(DateTimeOffset.AddMilliseconds), [typeof(double)])!, "millisecond"}
+            //{typeof(DateTimeOffset).GetRuntimeMethod(nameof(DateTimeOffset.AddMilliseconds), [typeof(double)])!, "millisecond"}
         };
 
         private static readonly Dictionary<MethodInfo, string> _methodInfoDateDiffMapping = new()
diff --git a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetStringMethodTranslator.cs b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetStringMethodTranslator.cs
index 8349d378..43ad70cb 100644
--- a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetStringMethodTranslator.cs
+++ b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetStringMethodTranslator.cs
@@ -190,6 +190,15 @@ private static readonly MethodInfo _lastOrDefaultMethodInfoWithoutArgs
                     {
                         argument = _sqlExpressionFactory.Coalesce(argument, _sqlExpressionFactory.Constant(0));
                     }
+
+                    argument = _sqlExpressionFactory.Case(
+                        [
+                            new CaseWhenClause(
+                                _sqlExpressionFactory.Equal(argument, _sqlExpressionFactory.Constant(-1)),
+                                _sqlExpressionFactory.Constant(0))
+                        ],
+                        argument);
+
                     return _sqlExpressionFactory.Function(
                         "MID",
                         [
diff --git a/src/EFCore.Jet/Query/Internal/JetLiftOrderByPostprocessor.cs b/src/EFCore.Jet/Query/Internal/JetLiftOrderByPostprocessor.cs
index 3e8b6238..844b988b 100644
--- a/src/EFCore.Jet/Query/Internal/JetLiftOrderByPostprocessor.cs
+++ b/src/EFCore.Jet/Query/Internal/JetLiftOrderByPostprocessor.cs
@@ -38,11 +38,10 @@ public virtual Expression Process(Expression expression)
         switch (expression)
         {
             case ShapedQueryExpression shapedQueryExpression:
-                shapedQueryExpression = shapedQueryExpression
-                    .UpdateQueryExpression(Visit(shapedQueryExpression.QueryExpression))
-                    .UpdateShaperExpression(Visit(shapedQueryExpression.ShaperExpression));
+                return shapedQueryExpression.Update(
+                    (SelectExpression)Visit(shapedQueryExpression.QueryExpression),
+                    Visit(shapedQueryExpression.ShaperExpression));
 
-                return shapedQueryExpression.UpdateShaperExpression(Visit(shapedQueryExpression.ShaperExpression));
             case RelationalSplitCollectionShaperExpression relationalSplitCollectionShaperExpression:
                 var newSelect = Visit(relationalSplitCollectionShaperExpression.SelectExpression);
                 var newInner = Visit(relationalSplitCollectionShaperExpression.InnerShaper);
diff --git a/src/EFCore.Jet/Query/Internal/JetQueryTranslationPreprocessor.cs b/src/EFCore.Jet/Query/Internal/JetQueryTranslationPreprocessor.cs
new file mode 100644
index 00000000..38440cda
--- /dev/null
+++ b/src/EFCore.Jet/Query/Internal/JetQueryTranslationPreprocessor.cs
@@ -0,0 +1,61 @@
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace EntityFrameworkCore.Jet.Query.Internal;
+
+/// <summary>
+///     Extends EF Core's query translation preprocessing with Jet-specific optimizations.
+///     Currently adds <c>LongCount() &gt; 0 → Any()</c> which mirrors EF Core's built-in
+///     <c>Count() &gt; 0 → Any()</c> optimization that is missing for the long variant.
+/// </summary>
+public class JetQueryTranslationPreprocessor(
+    QueryTranslationPreprocessorDependencies dependencies,
+    RelationalQueryTranslationPreprocessorDependencies relationalDependencies,
+    RelationalQueryCompilationContext queryCompilationContext)
+    : RelationalQueryTranslationPreprocessor(dependencies, relationalDependencies, queryCompilationContext)
+{
+    public override Expression Process(Expression query)
+    {
+        query = base.Process(query);
+        query = new LongCountToAnyVisitor().Visit(query);
+        return query;
+    }
+
+    private sealed class LongCountToAnyVisitor : ExpressionVisitor
+    {
+        protected override Expression VisitBinary(BinaryExpression binaryExpression)
+        {
+            var result = base.VisitBinary(binaryExpression);
+            if (result is not BinaryExpression { NodeType: ExpressionType.GreaterThan } binary)
+                return result;
+
+            if (binary.Left is MethodCallExpression { Method.IsGenericMethod: true } longCountCall
+                && IsZeroConstant(binary.Right)
+                && IsLongCountMethod(longCountCall.Method.GetGenericMethodDefinition()))
+            {
+                return MakeAnyCall(longCountCall);
+            }
+
+            return result;
+        }
+
+        private static bool IsZeroConstant(Expression expr)
+        {
+            if (expr is not ConstantExpression { Value: var val })
+                return false;
+            return val is int i && i == 0 || val is long l && l == 0;
+        }
+
+        private static bool IsLongCountMethod(MethodInfo method)
+            => method == QueryableMethods.LongCountWithoutPredicate
+                || method == QueryableMethods.LongCountWithPredicate;
+
+        private static Expression MakeAnyCall(MethodCallExpression longCountCall)
+        {
+            var elementType = longCountCall.Method.GetGenericArguments()[0];
+            var anyMethod = longCountCall.Arguments.Count == 2
+                ? QueryableMethods.AnyWithPredicate.MakeGenericMethod(elementType)
+                : QueryableMethods.AnyWithoutPredicate.MakeGenericMethod(elementType);
+            return Expression.Call(anyMethod, longCountCall.Arguments);
+        }
+    }
+}
diff --git a/src/EFCore.Jet/Query/Internal/JetQueryTranslationPreprocessorFactory.cs b/src/EFCore.Jet/Query/Internal/JetQueryTranslationPreprocessorFactory.cs
new file mode 100644
index 00000000..b6b09760
--- /dev/null
+++ b/src/EFCore.Jet/Query/Internal/JetQueryTranslationPreprocessorFactory.cs
@@ -0,0 +1,15 @@
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace EntityFrameworkCore.Jet.Query.Internal;
+
+public class JetQueryTranslationPreprocessorFactory(
+    QueryTranslationPreprocessorDependencies dependencies,
+    RelationalQueryTranslationPreprocessorDependencies relationalDependencies)
+    : IQueryTranslationPreprocessorFactory
+{
+    public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)
+        => new JetQueryTranslationPreprocessor(
+            dependencies,
+            relationalDependencies,
+            (RelationalQueryCompilationContext)queryCompilationContext);
+}
diff --git a/src/EFCore.Jet/Query/Internal/JetSqlTranslatingExpressionVisitor.cs b/src/EFCore.Jet/Query/Internal/JetSqlTranslatingExpressionVisitor.cs
index 2792f697..f5b1d430 100644
--- a/src/EFCore.Jet/Query/Internal/JetSqlTranslatingExpressionVisitor.cs
+++ b/src/EFCore.Jet/Query/Internal/JetSqlTranslatingExpressionVisitor.cs
@@ -82,6 +82,9 @@ private static readonly MethodInfo StringContainsMethodInfoChar
     private static readonly MethodInfo EscapeLikePatternParameterMethod =
         typeof(JetSqlTranslatingExpressionVisitor).GetTypeInfo().GetDeclaredMethod(nameof(ConstructLikePatternParameter))!;
 
+    private static readonly MethodInfo StringJoinMethodInfo
+        = typeof(string).GetRuntimeMethod(nameof(string.Join), [typeof(string), typeof(string[])])!;
+
     private const char LikeEscapeChar = '\\';
     private const string LikeEscapeString = "\\";
 
@@ -246,6 +249,35 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             return translation3;
         }
 
+        if (method == StringJoinMethodInfo
+            && methodCallExpression.Arguments[1] is NewArrayExpression newArrayExpression
+            && Visit(methodCallExpression.Arguments[0]) is SqlExpression separator)
+        {
+            var stringTypeMapping = separator.TypeMapping;
+
+            SqlExpression? result = null;
+
+            foreach (var expression in newArrayExpression.Expressions)
+            {
+                if (Visit(expression) is not SqlExpression translated)
+                {
+                    return QueryCompilationContext.NotTranslatedExpression;
+                }
+
+                translated = _sqlExpressionFactory.Coalesce(
+                    _sqlExpressionFactory.ApplyTypeMapping(translated, stringTypeMapping),
+                    _sqlExpressionFactory.Constant(string.Empty, stringTypeMapping));
+
+                result = result is null
+                    ? translated
+                    : _sqlExpressionFactory.Add(
+                        _sqlExpressionFactory.Add(result, separator),
+                        translated);
+            }
+
+            return result ?? _sqlExpressionFactory.Constant(string.Empty, stringTypeMapping);
+        }
+
         return base.VisitMethodCall(methodCallExpression);
 
         bool TryTranslateStartsEndsWithContains(
diff --git a/src/EFCore.Jet/Query/Sql/Internal/JetQuerySqlGenerator.cs b/src/EFCore.Jet/Query/Sql/Internal/JetQuerySqlGenerator.cs
index 6f0fe25c..7383165b 100644
--- a/src/EFCore.Jet/Query/Sql/Internal/JetQuerySqlGenerator.cs
+++ b/src/EFCore.Jet/Query/Sql/Internal/JetQuerySqlGenerator.cs
@@ -159,11 +159,10 @@ protected override Expression VisitSelect(SelectExpression selectExpression)
                             }
 
                             Sql.Append($"`{exp.Name}` IS NOT NULL");
+                            // Fix: check then append, don't mix increment into the block
                             if (ct < colexp.Count - 1)
-                            {
-                                ct++;
                                 Sql.Append(" AND ");
-                            }
+                            ct++;
                         }
                     }
 
@@ -207,108 +206,199 @@ protected override Expression VisitSelect(SelectExpression selectExpression)
             return selectExpression;
         }
 
-        private void VisitJetTables(IReadOnlyList<TableExpressionBase> Tables, bool addfromsql, out List<ColumnExpression> colexp)
+        private void VisitJetTables(IReadOnlyList<TableExpressionBase> tables, bool addFromSql, out List<ColumnExpression> colexp)
         {
             colexp = [];
-            // Implement Jet's non-standard JOIN syntax and DUAL table workaround.
-            // TODO: This does not properly handle all cases (especially when cross joins are involved).
-            if (Tables.Any())
+            if (!tables.Any())
             {
-                if (addfromsql)
-                {
-                    Sql.AppendLine().Append("FROM ");
-                }
+                GeneratePseudoFromClause();
+                return;
+            }
 
-                const int maxTablesWithoutBrackets = 2;
+            if (addFromSql)
+                Sql.AppendLine().Append("FROM ");
 
-                var nonCrossTableCount = Tables.Count(t => t is not CrossJoinExpression and not CrossApplyExpression);
+            if (tables.Any(t => t is CrossJoinExpression or CrossApplyExpression))
+                VisitJetTablesGrouped(tables, colexp);
+            else
+                VisitJetTablesLinear(tables, colexp);
+        }
+
+        // No cross joins: existing linear parenthesization algorithm.
+        private void VisitJetTablesLinear(IReadOnlyList<TableExpressionBase> tables, List<ColumnExpression> colexp)
+        {
+            const int maxTablesWithoutBrackets = 2;
+            var nonCrossTableCount = tables.Count(t => t is not CrossJoinExpression and not CrossApplyExpression);
+            Sql.Append(new string('(', Math.Max(0, nonCrossTableCount - maxTablesWithoutBrackets)));
+
+            var nonCrossTablesSeen = 0;
+            for (var index = 0; index < tables.Count; index++)
+            {
+                var tableExpression = tables[index];
+                var isCrossExpression = tableExpression is CrossJoinExpression or CrossApplyExpression;
 
-                Sql.Append(
-                    new string(
-                        '(',
-                        Math.Max(0, nonCrossTableCount - maxTablesWithoutBrackets)));
+                if (tableExpression is CrossApplyExpression or OuterApplyExpression)
+                    throw new UnreachableException();
 
-                var nonCrossTablesSeen = 0;
+                if (!isCrossExpression)
+                    nonCrossTablesSeen++;
 
-                for (var index = 0; index < Tables.Count; index++)
+                if (index > 0)
                 {
-                    var tableExpression = Tables[index];
+                    if (isCrossExpression)
+                        Sql.Append(",");
+                    else if (nonCrossTablesSeen > maxTablesWithoutBrackets)
+                        Sql.Append(")");
 
-                    var isApplyExpression = tableExpression is CrossApplyExpression or OuterApplyExpression;
-                    var isCrossExpression = tableExpression is CrossJoinExpression or CrossApplyExpression;
-                    var isNonCrossExpression = !isCrossExpression;
+                    Sql.AppendLine();
+                }
 
-                    if (isApplyExpression)
+                if (tableExpression is InnerJoinExpression innerJoin)
+                {
+                    var tempcolexp = innerJoin.JoinPredicate switch
                     {
-                        throw new UnreachableException();
-                    }
+                        SqlBinaryExpression bin => ExtractColumnExpressions(bin),
+                        SqlUnaryExpression unary => ExtractColumnExpressions(unary),
+                        _ => (List<ColumnExpression>)[]
+                    };
 
-                    if (isNonCrossExpression)
+                    if (tempcolexp.Any(col => col.TableAlias == tables[0].Alias))
                     {
-                        nonCrossTablesSeen++;
+                        Visit(tableExpression);
                     }
-
-                    if (index > 0)
+                    else
                     {
-                        if (isCrossExpression)
-                        {
-                            Sql.Append(",");
-                        }
-                        else if (nonCrossTablesSeen > maxTablesWithoutBrackets)
-                        {
-                            Sql.Append(")");
-                        }
-
-                        Sql.AppendLine();
+                        colexp.AddRange(tempcolexp);
+                        Sql.Append("LEFT JOIN ");
+                        Visit(innerJoin.Table);
+                        Sql.Append(" ON ");
+                        Visit(innerJoin.JoinPredicate);
                     }
+                }
+                else
+                {
+                    Visit(tableExpression);
+                }
+            }
+        }
 
-                    List<ColumnExpression> tempcolexp;
-                    if (tableExpression is InnerJoinExpression expression)
-                    {
-                        if (expression.JoinPredicate is SqlBinaryExpression binaryJoin)
-                        {
-                            tempcolexp = ExtractColumnExpressions(binaryJoin);
-                        }
-                        else if (expression.JoinPredicate is SqlUnaryExpression unaryJoin)
+        // Cross joins present: group each primary table with its associated joins so that
+        // each group is parenthesized independently before being comma-cross-joined.
+        // Jet rejects mixing comma (cross-join) and explicit JOIN at the same paren level.
+        private void VisitJetTablesGrouped(IReadOnlyList<TableExpressionBase> tables, List<ColumnExpression> colexp)
+        {
+            var groups = new List<(TableExpressionBase Primary, List<PredicateJoinExpressionBase> Joins, HashSet<string> OwnedAliases)>();
+
+            foreach (var table in tables)
+            {
+                switch (table)
+                {
+                    case CrossApplyExpression or OuterApplyExpression:
+                        throw new UnreachableException();
+                    case CrossJoinExpression cj:
+                        groups.Add((cj.Table, [], new HashSet<string> { cj.Table.Alias! }));
+                        break;
+                    case PredicateJoinExpressionBase join:
+                        var predicateAliases = ExtractTableAliases(join.JoinPredicate);
+                        var owner = groups.FirstOrDefault(g => g.OwnedAliases.Overlaps(predicateAliases));
+                        if (owner.Primary != null)
                         {
-                            tempcolexp = ExtractColumnExpressions(unaryJoin);
+                            owner.Joins.Add(join);
+                            owner.OwnedAliases.Add(join.Table.Alias!);
                         }
                         else
                         {
-                            tempcolexp = [];
+                            var last = groups[^1];
+                            last.Joins.Add(join);
+                            last.OwnedAliases.Add(join.Table.Alias!);
                         }
+                        break;
+                    default:
+                        groups.Add((table, [], new HashSet<string> { table.Alias! }));
+                        break;
+                }
+            }
 
-                        var referencesFirstTable = false;
-                        foreach (var col in tempcolexp)
-                        {
-                            if (col.TableAlias == Tables[0].Alias)
-                            {
-                                referencesFirstTable = true;
-                                break;
-                            }
-                        }
+            for (var i = 0; i < groups.Count; i++)
+            {
+                if (i > 0)
+                    Sql.Append(",").AppendLine();
 
-                        if (referencesFirstTable)
-                        {
-                            Visit(tableExpression);
-                            continue;
-                        }
+                var (primary, joins, _) = groups[i];
+                var groupTableCount = 1 + joins.Count;
 
-                        colexp.AddRange(tempcolexp);
-                        Sql.Append("LEFT JOIN ");
-                        Visit(expression.Table);
-                        Sql.Append(" ON ");
-                        Visit(expression.JoinPredicate);
-                    }
-                    else
-                    {
-                        Visit(tableExpression);
-                    }
+                if (joins.Count > 0)
+                    Sql.Append("(");
+
+                Sql.Append(new string('(', Math.Max(0, groupTableCount - 2)));
+
+                Visit(primary);
+
+                var nonSeen = 1;
+                foreach (var join in joins)
+                {
+                    nonSeen++;
+                    if (nonSeen > 2)
+                        Sql.Append(")");
+
+                    Sql.AppendLine();
+                    EmitJoinInGroup(join, primary, colexp);
+                }
+
+                if (joins.Count > 0)
+                    Sql.Append(")");
+            }
+        }
+
+        private void EmitJoinInGroup(PredicateJoinExpressionBase join, TableExpressionBase groupPrimary, List<ColumnExpression> colexp)
+        {
+            if (join is InnerJoinExpression innerJoin)
+            {
+                var tempcolexp = innerJoin.JoinPredicate switch
+                {
+                    SqlBinaryExpression bin => ExtractColumnExpressions(bin),
+                    SqlUnaryExpression unary => ExtractColumnExpressions(unary),
+                    _ => (List<ColumnExpression>)[]
+                };
+
+                if (tempcolexp.Any(col => col.TableAlias == groupPrimary.Alias))
+                    Visit(join);
+                else
+                {
+                    colexp.AddRange(tempcolexp);
+                    Sql.Append("LEFT JOIN ");
+                    Visit(innerJoin.Table);
+                    Sql.Append(" ON ");
+                    Visit(innerJoin.JoinPredicate);
                 }
             }
             else
             {
-                GeneratePseudoFromClause();
+                Visit(join);
+            }
+        }
+
+        private HashSet<string> ExtractTableAliases(SqlExpression expression)
+        {
+            var result = new HashSet<string>();
+            CollectTableAliases(expression, result);
+            return result;
+        }
+
+        private static void CollectTableAliases(SqlExpression expression, HashSet<string> result)
+        {
+            switch (expression)
+            {
+                case ColumnExpression col:
+                    result.Add(col.TableAlias);
+                    break;
+                case SqlBinaryExpression bin:
+                    CollectTableAliases(bin.Left, result);
+                    CollectTableAliases(bin.Right, result);
+                    break;
+                case SqlUnaryExpression unary:
+                    CollectTableAliases(unary.Operand, result);
+                    break;
             }
         }
 
@@ -352,7 +442,7 @@ private List<ColumnExpression> ExtractColumnExpressions(SqlUnaryExpression unary
 
             return result;
         }
-        
+
         protected override Expression VisitProjection(ProjectionExpression projectionExpression)
         {
             if (projectionExpression.Expression is SqlConstantExpression { Value: null } constantExpression && (constantExpression.Type == typeof(int) || constantExpression.Type == typeof(double) || constantExpression.Type == typeof(float) || constantExpression.Type == typeof(decimal) || constantExpression.Type == typeof(short)))
@@ -370,15 +460,25 @@ protected override Expression VisitColumn(ColumnExpression columnExpression)
             if (columnExpression.IsNullable && _nullNumerics.Contains(columnExpression.Name) && _convertMappings.TryGetValue(columnExpression.Type.Name, out var function))
             {
 
+                bool useValCStrCol = false;//columnExpression.Type.Name is nameof(Decimal) or nameof(Int64);
                 if (parent.TryPeek(out var exp) && exp is SqlBinaryExpression)
                 {
                     Sql.Append("IIF(");
                     base.VisitColumn(columnExpression);
                     Sql.Append(" IS NULL, NULL, ");
-                    Sql.Append(function);
-                    Sql.Append("(");
-                    base.VisitColumn(columnExpression);
-                    Sql.Append(")");
+                    if (useValCStrCol)
+                    {
+                        Sql.Append("Val(CStr(");
+                        base.VisitColumn(columnExpression);
+                        Sql.Append("))");
+                    }
+                    else
+                    {
+                        Sql.Append(function);
+                        Sql.Append("(");
+                        base.VisitColumn(columnExpression);
+                        Sql.Append(")");
+                    }
                     Sql.Append(")");
                     return columnExpression;
                 }
@@ -502,9 +602,18 @@ protected override Expression VisitSqlParameter(SqlParameterExpression sqlParame
                 {
                     if (_convertMappings.TryGetValue(sqlParameterExpression.Type.Name, out var conv))
                     {
-                        Sql.Append($"{conv}(");
-                        base.VisitSqlParameter(sqlParameterExpression);
-                        Sql.Append(")");
+                        /*if (sqlParameterExpression.Type.Name is nameof(Decimal) or nameof(Int64))
+                        {
+                            Sql.Append("Val(CStr(");
+                            base.VisitSqlParameter(sqlParameterExpression);
+                            Sql.Append("))");
+                        }
+                        else*/
+                        {
+                            Sql.Append($"{conv}(");
+                            base.VisitSqlParameter(sqlParameterExpression);
+                            Sql.Append(")");
+                        }
                         return sqlParameterExpression;
                     }
                 }
@@ -518,7 +627,7 @@ protected override Expression VisitSqlBinary(SqlBinaryExpression sqlBinaryExpres
 
             if (sqlBinaryExpression.OperatorType == ExpressionType.Coalesce)
             {
-                SqlConstantExpression nullcons = new(null,typeof(string), RelationalTypeMapping.NullMapping);
+                SqlConstantExpression nullcons = new(null, typeof(string), RelationalTypeMapping.NullMapping);
                 SqlUnaryExpression isnullexp = new(ExpressionType.Equal, sqlBinaryExpression.Left, typeof(bool), null);
                 List<CaseWhenClause> whenclause = [new CaseWhenClause(isnullexp, sqlBinaryExpression.Right)];
                 CaseExpression caseexp = new(whenclause, sqlBinaryExpression.Left);
@@ -561,7 +670,7 @@ protected override Expression VisitSqlConstant(SqlConstantExpression sqlConstant
         {
             if (sqlConstantExpression.TypeMapping == RelationalTypeMapping.NullMapping && sqlConstantExpression.Value is DateTime)
             {
-                sqlConstantExpression = (SqlConstantExpression)sqlConstantExpression.ApplyTypeMapping(new JetDateTimeTypeMapping("datetime", _options));
+                sqlConstantExpression = (SqlConstantExpression)sqlConstantExpression.ApplyTypeMapping(new JetDateTimeTypeMapping("datetime"));
             }
 
             parent.TryPeek(out var exp);
@@ -588,25 +697,25 @@ protected override Expression VisitSqlUnary(SqlUnaryExpression sqlUnaryExpressio
                 case ExpressionType.Convert:
                     return VisitJetConvertExpression(sqlUnaryExpression);
                 case ExpressionType.Not when sqlUnaryExpression.Type != typeof(bool):
-                {
-                    Sql.Append(" (BNOT");
-
-                    var requiresBrackets = RequiresParentheses(sqlUnaryExpression, sqlUnaryExpression.Operand);
-                    if (requiresBrackets)
                     {
-                        Sql.Append("(");
-                    }
+                        Sql.Append(" (BNOT");
 
-                    Visit(sqlUnaryExpression.Operand);
-                    if (requiresBrackets)
-                    {
-                        Sql.Append(")");
-                    }
+                        var requiresBrackets = RequiresParentheses(sqlUnaryExpression, sqlUnaryExpression.Operand);
+                        if (requiresBrackets)
+                        {
+                            Sql.Append("(");
+                        }
 
-                    Sql.Append(")");
+                        Visit(sqlUnaryExpression.Operand);
+                        if (requiresBrackets)
+                        {
+                            Sql.Append(")");
+                        }
 
-                    return sqlUnaryExpression;
-                }
+                        Sql.Append(")");
+
+                        return sqlUnaryExpression;
+                    }
                 default:
                     return base.VisitSqlUnary(sqlUnaryExpression);
             }
@@ -616,77 +725,101 @@ protected override Expression VisitSqlUnary(SqlUnaryExpression sqlUnaryExpressio
         private Expression VisitJetConvertExpression(SqlUnaryExpression convertExpression)
         {
             var typeMapping = convertExpression.TypeMapping ?? throw new InvalidOperationException(
-                    RelationalStrings.UnsupportedType(convertExpression.Type.ShortDisplayName()));
+                RelationalStrings.UnsupportedType(convertExpression.Type.ShortDisplayName()));
 
             // We are explicitly converting to the target type (convertExpression.Type) and not the CLR type of the
-            // accociated type mapping. This allows for conversions on the database side (e.g. CDBL()) but handling
+            // associated type mapping. This allows for conversions on the database side (e.g. CDBL()) but handling
             // of the returned value using a different (unaligned) type mapping (e.g. date/time related ones).
             if (_convertMappings.TryGetValue(convertExpression.Type.Name, out var function))
             {
                 SqlExpression checksqlexp = convertExpression.Operand;
-
                 SqlExpression? notnullsqlexp = null;
+
+                bool useValCStr = false;//convertExpression.Type.Name is nameof(Decimal) or nameof(Int64);
+
+                /*SqlFunctionExpression WrapConvert(SqlExpression inner) =>
+                    useValCStr
+                        ? new SqlFunctionExpression("Val",
+                            [new SqlFunctionExpression("CStr", [inner], false, [false], typeof(string), null)],
+                            false, [false], typeMapping.ClrType, null)
+                        : new SqlFunctionExpression(function, [inner], false, [false], typeMapping.ClrType, null);*/
+
+                SqlFunctionExpression WrapConvert(SqlExpression inner) =>
+                    useValCStr
+                        ? new SqlFunctionExpression("CVar", [inner],
+                            false, [false], typeMapping.ClrType, null)
+                        : new SqlFunctionExpression(function, [inner], false, [false], typeMapping.ClrType, null);
+
                 if (convertExpression.TypeMapping is ByteArrayTypeMapping)
                 {
                     notnullsqlexp = checksqlexp;
                 }
                 else
                 {
-                    notnullsqlexp = new SqlFunctionExpression(function, [convertExpression.Operand],
-                        false, [false], typeMapping.ClrType, null);
                     if (convertExpression.Operand.Type == typeof(bool))
                     {
-                        //create a new expression to multiply the result by -1 to flip the boolean value
-                        notnullsqlexp = new SqlBinaryExpression(ExpressionType.Multiply, notnullsqlexp,
-                            new SqlConstantExpression(-1, IntTypeMapping.Default), notnullsqlexp.Type, notnullsqlexp.TypeMapping);
+                        if (convertExpression.Type == typeof(bool))
+                        {
+                            // bool?bool: no flip needed, CBOOL(x) correctly returns true for any non-zero
+                            notnullsqlexp = WrapConvert(convertExpression.Operand);
+                        }
+                        else
+                        {
+                            // bool?numeric: flip inside conversion function
+                            // CBYTE/CINT/CLNG etc. need 0/1 not 0/-1
+                            var flippedOperand = new SqlBinaryExpression(
+                                ExpressionType.Multiply,
+                                convertExpression.Operand,
+                                new SqlConstantExpression(-1, IntTypeMapping.Default),
+                                convertExpression.Operand.Type,
+                                convertExpression.Operand.TypeMapping);
+
+                            notnullsqlexp = WrapConvert(flippedOperand);
+                        }
+                    }
+                    else
+                    {
+                        notnullsqlexp = WrapConvert(convertExpression.Operand);
                     }
-
                 }
 
-                SqlConstantExpression nullcons = new(null,typeof(string), RelationalTypeMapping.NullMapping);
+                SqlConstantExpression nullcons = new(null, typeof(string), RelationalTypeMapping.NullMapping);
                 SqlUnaryExpression isnullexp = new(ExpressionType.Equal, checksqlexp, typeof(bool), null);
                 List<CaseWhenClause> whenclause =
                 [
                     new CaseWhenClause(isnullexp, nullcons)
                 ];
                 CaseExpression caseexp = new(whenclause, notnullsqlexp);
+
                 switch (checksqlexp)
                 {
                     case ColumnExpression { IsNullable: true }:
                         Visit(caseexp);
                         break;
-                    case ColumnExpression columnExpression:
+                    case ColumnExpression:
                         Visit(notnullsqlexp);
                         break;
-                    case SqlFunctionExpression { IsNullable: true, ArgumentsPropagateNullability: not null } functionExpression when functionExpression.ArgumentsPropagateNullability.Any(d => d):
+                    case SqlFunctionExpression { IsNullable: true, ArgumentsPropagateNullability: not null } functionExpression
+                        when functionExpression.ArgumentsPropagateNullability.Any(d => d):
                         Visit(caseexp);
                         break;
-                    case SqlFunctionExpression functionExpression:
+                    case SqlFunctionExpression:
                         Visit(notnullsqlexp);
                         break;
                     case SqlBinaryExpression binaryExpression:
-                    {
-                        ColumnExpression? columnExpressionLeft = binaryExpression.Left as ColumnExpression;
-                        SqlFunctionExpression? functionExpressionLeft = binaryExpression.Left as SqlFunctionExpression;
-                        ColumnExpression? columnExpressionRight = binaryExpression.Right as ColumnExpression;
-                        SqlFunctionExpression? functionExpressionRight = binaryExpression.Right as SqlFunctionExpression;
-                        var leftnull = columnExpressionLeft is { IsNullable: true } ||
-                            functionExpressionLeft is { IsNullable: true };
-                        var rightnull = columnExpressionRight is { IsNullable: true } ||
-                            functionExpressionRight is { IsNullable: true };
-
-                        if (leftnull || rightnull)
                         {
-                            Visit(caseexp);
-                        }
-                        else
-                        {
-                            Visit(notnullsqlexp);
-                        }
+                            static bool IsNullable(SqlExpression? e) =>
+                                e is ColumnExpression { IsNullable: true }
+                                or SqlFunctionExpression { IsNullable: true };
 
-                        break;
-                    }
-                    case SqlUnaryExpression unaryExpression:
+                            if (IsNullable(binaryExpression.Left) || IsNullable(binaryExpression.Right))
+                                Visit(caseexp);
+                            else
+                                Visit(notnullsqlexp);
+
+                            break;
+                        }
+                    case SqlUnaryExpression:
                     case SqlConstantExpression { Value: not null }:
                         Visit(notnullsqlexp);
                         break;
@@ -695,7 +828,7 @@ private Expression VisitJetConvertExpression(SqlUnaryExpression convertExpressio
                         break;
                 }
 
-                return notnullsqlexp;
+                return convertExpression;
             }
 
             if (typeMapping.ClrType.Name == nameof(String))
@@ -877,6 +1010,72 @@ protected override Expression VisitSqlFunction(SqlFunctionExpression sqlFunction
                 return sqlFunctionExpression;
             }
 
+            if (sqlFunctionExpression.Name.Equals("REPLACE", StringComparison.OrdinalIgnoreCase) &&
+                sqlFunctionExpression.Arguments is { Count: 3 })
+            {
+                // Access VBA's Replace() throws "Type mismatch" when ANY argument is NULL rather than
+                // propagating NULL as relational semantics require. Access IIF is also non-short-circuit
+                // (evaluates both branches), so a simple IIF wrapper doesn't prevent the crash.
+                // Solution: outer IIF returns NULL when any nullable arg IS NULL, while inner IIFs
+                // substitute safe non-NULL placeholders so REPLACE never actually receives NULL.
+                static SqlExpression? GetNullableTarget(SqlExpression arg) => arg switch
+                {
+                    ColumnExpression { IsNullable: true } col => col,
+                    SqlUnaryExpression { OperatorType: ExpressionType.Convert, Operand: ColumnExpression { IsNullable: true } inner } => inner,
+                    SqlUnaryExpression { OperatorType: ExpressionType.Convert, Operand: SqlFunctionExpression { IsNullable: true } inner } => inner,
+                    _ => null
+                };
+
+                var arg0Check = GetNullableTarget(sqlFunctionExpression.Arguments[0]);
+                var arg1Check = GetNullableTarget(sqlFunctionExpression.Arguments[1]);
+                var arg2Check = GetNullableTarget(sqlFunctionExpression.Arguments[2]);
+
+                if (arg0Check != null || arg1Check != null || arg2Check != null)
+                {
+                    Sql.Append("IIF(");
+                    var nullChecks = new SqlExpression?[] { arg0Check, arg1Check, arg2Check }
+                        .Where(c => c != null).ToList();
+                    for (int i = 0; i < nullChecks.Count; i++)
+                    {
+                        if (i > 0) Sql.Append(" OR ");
+                        Visit(nullChecks[i]!);
+                        Sql.Append(" IS NULL");
+                    }
+                    Sql.Append(", NULL, REPLACE(");
+
+                    // Arg 0 (expression): '' prevents Type mismatch if NULL slips past outer IIF
+                    if (arg0Check != null)
+                    {
+                        Sql.Append("IIF("); Visit(arg0Check); Sql.Append(" IS NULL, '', ");
+                        Visit(sqlFunctionExpression.Arguments[0]); Sql.Append(")");
+                    }
+                    else Visit(sqlFunctionExpression.Arguments[0]);
+
+                    Sql.Append(", ");
+
+                    // Arg 1 (find): CHR(1) is a safe non-empty placeholder unlikely to appear in data
+                    if (arg1Check != null)
+                    {
+                        Sql.Append("IIF("); Visit(arg1Check); Sql.Append(" IS NULL, CHR(1), ");
+                        Visit(sqlFunctionExpression.Arguments[1]); Sql.Append(")");
+                    }
+                    else Visit(sqlFunctionExpression.Arguments[1]);
+
+                    Sql.Append(", ");
+
+                    // Arg 2 (replacewith): CHR(1) placeholder; result is discarded by outer IIF anyway
+                    if (arg2Check != null)
+                    {
+                        Sql.Append("IIF("); Visit(arg2Check); Sql.Append(" IS NULL, CHR(1), ");
+                        Visit(sqlFunctionExpression.Arguments[2]); Sql.Append(")");
+                    }
+                    else Visit(sqlFunctionExpression.Arguments[2]);
+
+                    Sql.Append("))");
+                    return sqlFunctionExpression;
+                }
+            }
+
             if (sqlFunctionExpression.Name.Equals("MID", StringComparison.OrdinalIgnoreCase) &&
                 sqlFunctionExpression.Arguments is { Count: > 2 })
             {
diff --git a/src/EFCore.Jet/Scaffolding/Internal/JetDatabaseModelFactory.cs b/src/EFCore.Jet/Scaffolding/Internal/JetDatabaseModelFactory.cs
index c01665d3..439194bf 100644
--- a/src/EFCore.Jet/Scaffolding/Internal/JetDatabaseModelFactory.cs
+++ b/src/EFCore.Jet/Scaffolding/Internal/JetDatabaseModelFactory.cs
@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 using EntityFrameworkCore.Jet.Internal;
+using EntityFrameworkCore.Jet.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
 using EntityFrameworkCore.Jet.Utilities;
 
@@ -269,6 +270,10 @@ private void GetColumns(DbConnection connection, IReadOnlyList<DatabaseTable> ta
                                 : default(ValueGenerated?)
                     };
 
+                    column[JetAnnotationNames.IdentitySeed] = identitySeed;
+                    column[JetAnnotationNames.IdentityIncrement] = identityIncrement;
+                    column[JetAnnotationNames.Identity] = $"(${identitySeed}, ${identityIncrement})";
+
                     if (storeType == "timestamp")
                     {
                         // Note: annotation name must match `ScaffoldingAnnotationNames.ConcurrencyToken`
diff --git a/src/EFCore.Jet/Storage/Internal/JetBoolTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetBoolTypeMapping.cs
index 8e1bde9b..66bb9278 100644
--- a/src/EFCore.Jet/Storage/Internal/JetBoolTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetBoolTypeMapping.cs
@@ -4,6 +4,8 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetBoolTypeMapping : BoolTypeMapping
     {
+        public static new JetBoolTypeMapping Default { get; }  = new("smallint");
+
         public JetBoolTypeMapping(
             string storeType,
             DbType? dbType = System.Data.DbType.Boolean)
diff --git a/src/EFCore.Jet/Storage/Internal/JetByteArrayTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetByteArrayTypeMapping.cs
index 283eb301..21733afa 100644
--- a/src/EFCore.Jet/Storage/Internal/JetByteArrayTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetByteArrayTypeMapping.cs
@@ -12,7 +12,7 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
     /// </summary>
     public class JetByteArrayTypeMapping : ByteArrayTypeMapping
     {
-
+        public static new JetByteArrayTypeMapping Default { get; } = new();
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
diff --git a/src/EFCore.Jet/Storage/Internal/JetByteTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetByteTypeMapping.cs
index 21ad90e2..571370d6 100644
--- a/src/EFCore.Jet/Storage/Internal/JetByteTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetByteTypeMapping.cs
@@ -13,6 +13,8 @@ namespace EntityFrameworkCore.Jet.Storage.Internal;
 /// </summary>
 public class JetByteTypeMapping : ByteTypeMapping
 {
+    public static new JetByteTypeMapping Default { get; } = new("byte", System.Data.DbType.Byte);
+
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
diff --git a/src/EFCore.Jet/Storage/Internal/JetDateOnlyTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetDateOnlyTypeMapping.cs
index 2a11e038..5a82d699 100644
--- a/src/EFCore.Jet/Storage/Internal/JetDateOnlyTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetDateOnlyTypeMapping.cs
@@ -3,32 +3,27 @@
 using System.Data;
 using System.Globalization;
 using System.Text;
-using EntityFrameworkCore.Jet.Data;
-using EntityFrameworkCore.Jet.Infrastructure.Internal;
 
 namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetDateOnlyTypeMapping : DateOnlyTypeMapping
     {
-        private readonly IJetOptions _options;
 
+        public static new JetDateOnlyTypeMapping Default { get; } = new JetDateOnlyTypeMapping("date", dbType: System.Data.DbType.Date);
         public JetDateOnlyTypeMapping(
             string storeType,
-            IJetOptions options,
             DbType? dbType = null)
             : base(storeType)
         {
-            _options = options;
         }
 
-        protected JetDateOnlyTypeMapping(RelationalTypeMappingParameters parameters, IJetOptions options)
+        protected JetDateOnlyTypeMapping(RelationalTypeMappingParameters parameters)
             : base(parameters)
         {
-            _options = options;
         }
 
         protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters parameters)
-            => new JetDateOnlyTypeMapping(parameters, _options);
+            => new JetDateOnlyTypeMapping(parameters);
 
         protected override void ConfigureParameter(DbParameter parameter)
         {
diff --git a/src/EFCore.Jet/Storage/Internal/JetDateTimeOffsetTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetDateTimeOffsetTypeMapping.cs
index 5b17855d..5149a1d5 100644
--- a/src/EFCore.Jet/Storage/Internal/JetDateTimeOffsetTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetDateTimeOffsetTypeMapping.cs
@@ -1,32 +1,31 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Globalization;
 using EntityFrameworkCore.Jet.Infrastructure.Internal;
+using Microsoft.Extensions.Options;
+using System.Globalization;
 
 namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetDateTimeOffsetTypeMapping : DateTimeOffsetTypeMapping
     {
-        private readonly IJetOptions _options;
         private const string DateTimeOffsetFormatConst = @"'{0:yyyy-MM-ddTHH:mm:ss.fffffffzzz}'";
         private const string DateTimeFormatConst = @"'{0:yyyy-MM-dd HH:mm:ss}'";
+
+        public static new JetDateTimeOffsetTypeMapping Default { get; } = new JetDateTimeOffsetTypeMapping("datetime");
         public JetDateTimeOffsetTypeMapping(
-                string storeType,
-                IJetOptions options)
+                string storeType)
             : base(
                 storeType, System.Data.DbType.DateTime)
         {
-            _options = options;
         }
 
-        protected JetDateTimeOffsetTypeMapping(RelationalTypeMappingParameters parameters, IJetOptions options)
+        protected JetDateTimeOffsetTypeMapping(RelationalTypeMappingParameters parameters)
             : base(parameters)
         {
-            _options = options;
         }
 
         protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters parameters)
-            => new JetDateTimeOffsetTypeMapping(parameters, _options);
+            => new JetDateTimeOffsetTypeMapping(parameters);
 
         protected override void ConfigureParameter(DbParameter parameter)
         {
diff --git a/src/EFCore.Jet/Storage/Internal/JetDateTimeTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetDateTimeTypeMapping.cs
index 214e3462..dbb9e6bc 100644
--- a/src/EFCore.Jet/Storage/Internal/JetDateTimeTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetDateTimeTypeMapping.cs
@@ -11,27 +11,24 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
     public class JetDateTimeTypeMapping : DateTimeTypeMapping
     {
         private const int MaxDateTimeDoublePrecision = 10;
-        private static readonly JetDecimalTypeMapping _decimalTypeMapping = new("decimal", System.Data.DbType.Decimal, 18, 10);
-        private readonly IJetOptions _options;
+
+        public static new JetDateTimeTypeMapping Default { get; } = new JetDateTimeTypeMapping("datetime", dbType: System.Data.DbType.DateTime);
 
         public JetDateTimeTypeMapping(
             string storeType,
-            IJetOptions options,
             DbType? dbType = null,
             Type? clrType = null)
             : base(storeType)
         {
-            _options = options;
         }
 
-        protected JetDateTimeTypeMapping(RelationalTypeMappingParameters parameters, IJetOptions options)
+        protected JetDateTimeTypeMapping(RelationalTypeMappingParameters parameters)
             : base(parameters)
         {
-            _options = options;
         }
 
         protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters parameters)
-            => new JetDateTimeTypeMapping(parameters, _options);
+            => new JetDateTimeTypeMapping(parameters);
 
         protected override void ConfigureParameter(DbParameter parameter)
         {
@@ -41,16 +38,6 @@ protected override void ConfigureParameter(DbParameter parameter)
             }
             base.ConfigureParameter(parameter);
 
-            if (_options.EnableMillisecondsSupport &&
-                parameter.Value is DateTime dateTime)
-            {
-                parameter.Value = GetDateTimeDoubleValueAsDecimal(dateTime, _options.EnableMillisecondsSupport);
-                parameter.ResetDbType();
-
-                // Necessary to explicitly set for OLE DB, to apply the System.Decimal value as DOUBLE to Jet.
-                parameter.DbType = System.Data.DbType.Double;
-            }
-
             if ((parameter.DbType == System.Data.DbType.Date || StoreTypeNameBase == "date") && parameter.Value is DateTime date)
             {
                 parameter.Value = date.Date;
@@ -71,12 +58,6 @@ public virtual string GenerateNonNullSqlLiteral(object value, bool defaultClause
 
             var literal = new StringBuilder();
 
-            if (defaultClauseCompatible &&
-                _options.EnableMillisecondsSupport)
-            {
-                return _decimalTypeMapping.GenerateSqlLiteral(GetDateTimeDoubleValueAsDecimal(dateTime, _options.EnableMillisecondsSupport));
-            }
-
             literal.Append(
                 defaultClauseCompatible
                     ? "'"
@@ -95,53 +76,12 @@ public virtual string GenerateNonNullSqlLiteral(object value, bool defaultClause
                     ? "'"
                     : "#");
 
-            if (_options.EnableMillisecondsSupport &&
-                time != TimeSpan.Zero)
-            {
-                // Round to milliseconds.
-                var millisecondsTicks = time.Ticks % TimeSpan.TicksPerSecond / TimeSpan.TicksPerMillisecond * TimeSpan.TicksPerMillisecond;
-                if (millisecondsTicks > 0)
-                {
-                    var jetTimeDoubleFractions = Math.Round((decimal)millisecondsTicks / TimeSpan.TicksPerDay, MaxDateTimeDoublePrecision);
-
-                    literal
-                        .Insert(0, "(")
-                        .Append(" + ")
-                        .Append(_decimalTypeMapping.GenerateSqlLiteral(jetTimeDoubleFractions))
-                        .Append(")");
-                }
-            }
-
             return literal.ToString();
         }
 
         protected virtual DateTime ConvertToDateTimeCompatibleValue(object value)
             => (DateTime)value;
 
-        private static decimal GetDateTimeDoubleValueAsDecimal(DateTime dateTime, bool millisecondsSupportEnabled)
-        {
-            //
-            // We are explicitly using System.Decimal here, so we get better scale results:
-            //
-
-            var checkDateTimeValue = CheckDateTimeValue(dateTime) - JetConfiguration.TimeSpanOffset;
-
-            if (millisecondsSupportEnabled)
-            {
-                // Round to milliseconds.
-                var millisecondsTicks = checkDateTimeValue.Ticks / TimeSpan.TicksPerMillisecond * TimeSpan.TicksPerMillisecond;
-                var result = /*Math.Round(*/(decimal)millisecondsTicks / TimeSpan.TicksPerDay/*, MaxDateTimeDoublePrecision, MidpointRounding.AwayFromZero)*/;
-                return result;
-            }
-            else
-            {
-                // Round to seconds.
-                var secondsTicks = checkDateTimeValue.Ticks / TimeSpan.TicksPerSecond * TimeSpan.TicksPerSecond;
-                var result = /*Math.Round(*/(decimal)secondsTicks / TimeSpan.TicksPerDay/*, MaxDateTimeDoublePrecision, MidpointRounding.AwayFromZero)*/;
-                return result;
-            }
-        }
-
         private static DateTime CheckDateTimeValue(DateTime dateTime)
         {
             if (dateTime < new DateTime(100,1,1))
diff --git a/src/EFCore.Jet/Storage/Internal/JetDecimalTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetDecimalTypeMapping.cs
index fd145321..16840736 100644
--- a/src/EFCore.Jet/Storage/Internal/JetDecimalTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetDecimalTypeMapping.cs
@@ -11,6 +11,8 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
     /// </summary>
     public class JetDecimalTypeMapping : DecimalTypeMapping
     {
+
+        public static new JetDecimalTypeMapping Default { get; } = new("decimal(18,2)", System.Data.DbType.Decimal, precision: 18, scale: 2, StoreTypePostfix.PrecisionAndScale);
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
diff --git a/src/EFCore.Jet/Storage/Internal/JetDoubleTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetDoubleTypeMapping.cs
index 1732a188..3e18431e 100644
--- a/src/EFCore.Jet/Storage/Internal/JetDoubleTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetDoubleTypeMapping.cs
@@ -6,6 +6,8 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetDoubleTypeMapping : DoubleTypeMapping
     {
+        public static new JetDoubleTypeMapping Default { get; } = new("double");
+
         public JetDoubleTypeMapping(
             string storeType)
             : base(storeType, System.Data.DbType.Double)
diff --git a/src/EFCore.Jet/Storage/Internal/JetFloatTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetFloatTypeMapping.cs
index 84e4fd3b..db22830f 100644
--- a/src/EFCore.Jet/Storage/Internal/JetFloatTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetFloatTypeMapping.cs
@@ -6,6 +6,7 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetFloatTypeMapping : FloatTypeMapping
     {
+        public static new JetFloatTypeMapping Default { get; } = new("single");
         public JetFloatTypeMapping(
             string storeType)
             : base(storeType, System.Data.DbType.Single)
diff --git a/src/EFCore.Jet/Storage/Internal/JetGuidTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetGuidTypeMapping.cs
index 3aa86914..74920be6 100644
--- a/src/EFCore.Jet/Storage/Internal/JetGuidTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetGuidTypeMapping.cs
@@ -4,6 +4,8 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetGuidTypeMapping : GuidTypeMapping
     {
+        public static new JetGuidTypeMapping Default { get; } = new JetGuidTypeMapping("uniqueidentifier");
+
         public JetGuidTypeMapping(string storeType, DbType? dbType = System.Data.DbType.Guid) : base(storeType, dbType)
         {
         }
diff --git a/src/EFCore.Jet/Storage/Internal/JetIntTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetIntTypeMapping.cs
index b294de77..d5bec2f1 100644
--- a/src/EFCore.Jet/Storage/Internal/JetIntTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetIntTypeMapping.cs
@@ -2,6 +2,8 @@
 
 public class JetIntTypeMapping : IntTypeMapping
 {
+    public static new JetIntTypeMapping Default { get; } = new JetIntTypeMapping("integer");
+
     public JetIntTypeMapping(string storeType)
         : base(storeType, System.Data.DbType.Int32)
     {
diff --git a/src/EFCore.Jet/Storage/Internal/JetLongTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetLongTypeMapping.cs
index b62e9727..5ffa54f6 100644
--- a/src/EFCore.Jet/Storage/Internal/JetLongTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetLongTypeMapping.cs
@@ -4,6 +4,9 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetLongTypeMapping : LongTypeMapping
     {
+        public static new JetLongTypeMapping Default { get; } = new("decimal(20, 0)", precision: 20, scale: 0,
+            StoreTypePostfix.PrecisionAndScale);
+
         public JetLongTypeMapping(string storeType,
             int? precision = null,
             int? scale = null,
diff --git a/src/EFCore.Jet/Storage/Internal/JetOdbcGuidTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetOdbcGuidTypeMapping.cs
index e8b7a9aa..73867155 100644
--- a/src/EFCore.Jet/Storage/Internal/JetOdbcGuidTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetOdbcGuidTypeMapping.cs
@@ -4,6 +4,8 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetOdbcGuidTypeMapping : JetGuidTypeMapping
     {
+        public static new JetOdbcGuidTypeMapping Default { get; } = new JetOdbcGuidTypeMapping("uniqueidentifier");
+
         public JetOdbcGuidTypeMapping(string storeType) : base(storeType, System.Data.DbType.Guid)
         {
         }
diff --git a/src/EFCore.Jet/Storage/Internal/JetSqlGenerationHelper.cs b/src/EFCore.Jet/Storage/Internal/JetSqlGenerationHelper.cs
index c5d09280..630e82ee 100644
--- a/src/EFCore.Jet/Storage/Internal/JetSqlGenerationHelper.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetSqlGenerationHelper.cs
@@ -26,7 +26,8 @@ public override string EscapeIdentifier(string identifier)
             Check.NotEmpty(identifier, nameof(identifier));
 
             identifier = identifier
-                .Replace(".", "#");
+                .Replace(".", "#")
+                .Replace("`", "``");
 
             return identifier;
         }
@@ -40,7 +41,8 @@ public override void EscapeIdentifier(StringBuilder builder, string identifier)
             Check.NotEmpty(identifier, nameof(identifier));
 
             identifier = identifier
-                .Replace(".", "#");
+                .Replace(".", "#")
+                .Replace("`", "``");
             
             builder.Append(identifier);
         }
diff --git a/src/EFCore.Jet/Storage/Internal/JetStringTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetStringTypeMapping.cs
index ba10dda0..8e0be35f 100644
--- a/src/EFCore.Jet/Storage/Internal/JetStringTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetStringTypeMapping.cs
@@ -14,6 +14,8 @@ public class JetStringTypeMapping : StringTypeMapping
         private readonly bool _keepLineBreakCharacters;
         private readonly int _maxSpecificSize;
 
+        public static new JetStringTypeMapping Default { get; } = new();
+
         private static readonly CaseInsensitiveValueComparer CaseInsensitiveValueComparer = new();
 
         /// <summary>
@@ -22,7 +24,7 @@ public class JetStringTypeMapping : StringTypeMapping
         /// </summary>
         public JetStringTypeMapping(
             string? storeType = null,
-            bool unicode = false,
+            bool unicode = true ,
             int? size = null,
             bool fixedLength = false,
             StoreTypePostfix? storeTypePostfix = null,
diff --git a/src/EFCore.Jet/Storage/Internal/JetTimeOnlyTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetTimeOnlyTypeMapping.cs
index b8e1772c..2bbd61af 100644
--- a/src/EFCore.Jet/Storage/Internal/JetTimeOnlyTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetTimeOnlyTypeMapping.cs
@@ -6,20 +6,16 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetTimeOnlyTypeMapping : TimeOnlyTypeMapping
     {
-        private readonly IJetOptions _options;
-
+        public static new JetTimeOnlyTypeMapping Default { get; } = new JetTimeOnlyTypeMapping("time");
         public JetTimeOnlyTypeMapping(
-                string storeType,
-                IJetOptions options)
+                string storeType)
             : base(storeType)
         {
-            _options = options;
         }
 
-        protected JetTimeOnlyTypeMapping(RelationalTypeMappingParameters parameters, IJetOptions options)
+        protected JetTimeOnlyTypeMapping(RelationalTypeMappingParameters parameters)
             : base(parameters)
         {
-            _options = options;
         }
 
         protected override void ConfigureParameter(DbParameter parameter)
@@ -34,20 +30,11 @@ protected override void ConfigureParameter(DbParameter parameter)
         }
 
         protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters parameters)
-            => new JetTimeOnlyTypeMapping(parameters, _options);
+            => new JetTimeOnlyTypeMapping(parameters);
 
         protected override string GenerateNonNullSqlLiteral(object value)
         {
-            //Format time without any milliseconds
-            if (!_options.EnableMillisecondsSupport)
-            {
-                return FormattableString.Invariant($@"TIMEVALUE('{value:HH\:mm\:ss}')");
-            }
-            else
-            {
-                //TODO: Treat as double
-                return "";
-            }
+            return FormattableString.Invariant($@"TIMEVALUE('{value:HH\:mm\:ss}')");
         }
 
         protected override string ProcessStoreType(RelationalTypeMappingParameters parameters, string storeType, string storeTypeNameBase)
diff --git a/src/EFCore.Jet/Storage/Internal/JetTimeSpanTypeMapping.cs b/src/EFCore.Jet/Storage/Internal/JetTimeSpanTypeMapping.cs
index 787e67eb..ba74a6e1 100644
--- a/src/EFCore.Jet/Storage/Internal/JetTimeSpanTypeMapping.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetTimeSpanTypeMapping.cs
@@ -6,24 +6,21 @@ namespace EntityFrameworkCore.Jet.Storage.Internal
 {
     public class JetTimeSpanTypeMapping : TimeSpanTypeMapping
     {
-        private readonly IJetOptions _options;
+        public static new JetTimeSpanTypeMapping Default { get; } = new JetTimeSpanTypeMapping("datetime");
 
         public JetTimeSpanTypeMapping(
-                string storeType,
-                IJetOptions options)
+                string storeType)
             : base(storeType)
         {
-            _options = options;
         }
 
-        protected JetTimeSpanTypeMapping(RelationalTypeMappingParameters parameters, IJetOptions options)
+        protected JetTimeSpanTypeMapping(RelationalTypeMappingParameters parameters)
             : base(parameters)
         {
-            _options = options;
         }
 
         protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters parameters)
-            => new JetTimeSpanTypeMapping(parameters, _options);
+            => new JetTimeSpanTypeMapping(parameters);
 
         /*protected override DateTime ConvertToDateTimeCompatibleValue(object value)
             => JetConfiguration.TimeSpanOffset + (TimeSpan)value;*/
diff --git a/src/EFCore.Jet/Storage/Internal/JetTypeMappingSource.cs b/src/EFCore.Jet/Storage/Internal/JetTypeMappingSource.cs
index 0750a6bd..c292c402 100644
--- a/src/EFCore.Jet/Storage/Internal/JetTypeMappingSource.cs
+++ b/src/EFCore.Jet/Storage/Internal/JetTypeMappingSource.cs
@@ -21,19 +21,19 @@ public class JetTypeMappingSource : RelationalTypeMappingSource
         private readonly JetByteArrayTypeMapping _unboundedBinary = new("longbinary", storeTypePostfix: StoreTypePostfix.None);
 
         private readonly JetBoolTypeMapping _bit = new("bit"); // JET bits are not nullable
-        private readonly JetBoolTypeMapping _bool = new("smallint");
+        private readonly JetBoolTypeMapping _bool = JetBoolTypeMapping.Default;
 
         // We just map counter etc. to integer. Whether an integer property/column is actually a counter
         // is determined by the value generation type.
-        private readonly IntTypeMapping _counter = new JetIntTypeMapping("integer");
+        private readonly JetIntTypeMapping _counter = JetIntTypeMapping.Default;
 
-        private readonly JetByteTypeMapping _byte = new("byte", DbType.Byte); // unsigned, there is no signed byte in Jet
+        private readonly JetByteTypeMapping _byte = JetByteTypeMapping.Default; // unsigned, there is no signed byte in Jet
         private readonly ShortTypeMapping _smallint = new("smallint", DbType.Int16);
-        private readonly IntTypeMapping _integer = new JetIntTypeMapping("integer");
-        private readonly JetLongTypeMapping _bigint = new("decimal(20, 0)", precision: 20, scale: 0, StoreTypePostfix.PrecisionAndScale);
+        private readonly JetIntTypeMapping _integer = JetIntTypeMapping.Default;
+        private readonly JetLongTypeMapping _bigint = JetLongTypeMapping.Default;
 
-        private readonly JetFloatTypeMapping _single = new("single");
-        private readonly JetDoubleTypeMapping _double = new("double");
+        private readonly JetFloatTypeMapping _single = JetFloatTypeMapping.Default;
+        private readonly JetDoubleTypeMapping _double = JetDoubleTypeMapping.Default;
 
         private readonly JetDecimalTypeMapping _decimal = new("decimal(18,2)", DbType.Decimal, precision: 18, scale: 2, StoreTypePostfix.PrecisionAndScale);
         private readonly JetDecimalTypeMapping _decimal18_0 = new("decimal", DbType.Decimal, precision: 18, scale: 0);
@@ -80,18 +80,18 @@ public JetTypeMappingSource(
             // https://sourcedaddy.com/ms-access/sql-data-types.html
 
             _guid = options.DataAccessProviderType == DataAccessProviderType.Odbc
-                ? new JetOdbcGuidTypeMapping("uniqueidentifier")
-                : new JetGuidTypeMapping("uniqueidentifier", DbType.Guid);
+                ? JetOdbcGuidTypeMapping.Default
+                : JetGuidTypeMapping.Default;
 
             // TODO: Check the types and their mappings against
             //       https://docs.microsoft.com/en-us/previous-versions/office/developer/office2000/aa140015(v=office.10)
 
-            _datetime = new JetDateTimeTypeMapping("datetime", options, dbType: DbType.DateTime);
-            _dateasdatetime = new JetDateTimeTypeMapping("date", options, dbType: DbType.Date);
-            _datetimeoffset = new JetDateTimeOffsetTypeMapping("datetime", options);
-            _dateonly = new JetDateOnlyTypeMapping("date", options, dbType: DbType.Date);
-            _timeonly = new JetTimeOnlyTypeMapping("time", options);
-            _timespan = new JetTimeSpanTypeMapping("datetime", options);
+            _datetime = JetDateTimeTypeMapping.Default;
+            _dateasdatetime = new JetDateTimeTypeMapping("date", dbType: DbType.Date);
+            _datetimeoffset = JetDateTimeOffsetTypeMapping.Default;
+            _dateonly = JetDateOnlyTypeMapping.Default;
+            _timeonly = JetTimeOnlyTypeMapping.Default;
+            _timespan = JetTimeSpanTypeMapping.Default;
             
             _storeTypeMappings
                 = new Dictionary<string, RelationalTypeMapping[]>(StringComparer.OrdinalIgnoreCase)
@@ -126,9 +126,10 @@ public JetTypeMappingSource(
                     {"integer2", [_smallint] },
 
                     {"integer", [_integer] },
-                    {"long", [_bigint] },
+                    {"long", [_integer] },
                     {"int", [_integer] },
                     {"integer4", [_integer] },
+                    //{"bigint", [_bigint] },
 
                     {"single", [_single] },
                     {"real", [_single] },
diff --git a/test/EFCore.Jet.Data.Tests/ConnectionStringTest.cs b/test/EFCore.Jet.Data.Tests/ConnectionStringTest.cs
index e916484c..c0b6df24 100644
--- a/test/EFCore.Jet.Data.Tests/ConnectionStringTest.cs
+++ b/test/EFCore.Jet.Data.Tests/ConnectionStringTest.cs
@@ -86,6 +86,20 @@ public void Odbc_connection_string_with_all_properties_from_factory()
             Assert.AreEqual("""driver="{Microsoft Access Driver (*.mdb, *.accdb)}";dbq=ConnectionStringTest.accdb;uid=Admin;pwd=DbPwd;systemdb=SysDb""", csb.ConnectionString);
         }
 
+        [TestMethod]
+        public void Odbc_connection_string_preserves_native_driver_braces_when_normalized()
+        {
+            const string connectionString = """driver="{Microsoft Access Driver (*.mdb, *.accdb)}";dbq=D:\toolkits\myefcorejet9\test\EFCore.Jet.Data.Tests\bin\x86\Debug\net10.0-windows7.0\ConnectionPoolingTest.accdb;extendedansisql=1""";
+
+            var normalizedConnectionString = JetConnection.GetConnectionString(connectionString, OdbcFactory.Instance);
+
+            StringAssert.Contains(normalizedConnectionString, "Driver={Microsoft Access Driver (*.mdb, *.accdb)}");
+            Assert.IsFalse(
+                normalizedConnectionString.Contains("driver=\"{Microsoft Access Driver (*.mdb, *.accdb)}\"", System.StringComparison.OrdinalIgnoreCase),
+                normalizedConnectionString);
+            StringAssert.Contains(normalizedConnectionString, "extendedansisql=1");
+        }
+
         [TestMethod]
         public void OleDb_read_connection_string_with_all_properties()
         {
@@ -100,6 +114,26 @@ public void OleDb_read_connection_string_with_all_properties()
             Assert.AreEqual("DbPwd", csb.DatabasePassword);
         }
 
+        [TestMethod]
+        public void OleDb_connection_string_preserves_extra_keywords_when_normalized()
+        {
+            const string connectionString = @"Provider=Microsoft.ACE.OLEDB.12.0;Jet OLEDB:Engine Type=4;Jet OLEDB:MaxLocksPerFile=100000;Mode=Share Deny None;Persist Security Info=False;Extended Properties='MaxLocksPerFile=100000';Data Source=c:\Temp\Access97EF\test.mdb;";
+
+            var normalizedConnectionString = JetConnection.GetConnectionString(connectionString, OleDbFactory.Instance);
+            var csb = new JetConnectionStringBuilder(DataAccessProviderType.OleDb) { ConnectionString = normalizedConnectionString };
+
+            Assert.IsTrue(csb.TryGetValue("Jet OLEDB:Engine Type", out var engineType), normalizedConnectionString);
+            Assert.AreEqual("4", engineType);
+            Assert.IsTrue(csb.TryGetValue("Jet OLEDB:MaxLocksPerFile", out var maxLocksPerFile), normalizedConnectionString);
+            Assert.AreEqual("100000", maxLocksPerFile);
+            Assert.IsTrue(csb.TryGetValue("Mode", out var mode), normalizedConnectionString);
+            Assert.AreEqual("Share Deny None", mode);
+            Assert.IsTrue(csb.TryGetValue("Persist Security Info", out var persistSecurityInfo), normalizedConnectionString);
+            Assert.AreEqual("False", persistSecurityInfo);
+            Assert.IsTrue(csb.TryGetValue("Extended Properties", out var extendedProperties), normalizedConnectionString);
+            Assert.AreEqual("MaxLocksPerFile=100000", extendedProperties);
+        }
+
         [TestMethod]
         public void OleDb_connection_string_with_all_properties()
         {
@@ -133,4 +167,4 @@ public void OleDb_connection_string_with_all_properties_from_factory()
                                      or @"provider=Microsoft.ACE.OLEDB.12.0;data source=ConnectionStringTest.accdb;user id=Admin;password=hunter2;jet oledb:system database=SysDb;jet oledb:database password=DbPwd");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/EFCore.Jet.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesJetTest.cs b/test/EFCore.Jet.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesJetTest.cs
index 7c956601..ea6e0f48 100644
--- a/test/EFCore.Jet.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesJetTest.cs
@@ -735,6 +735,18 @@ public override async Task Update_Where_set_constant_via_lambda(bool async)
 """);
     }
 
+    public override async Task Update_Where_set_nullable_int_constant_via_discard_lambda(bool async)
+    {
+        await base.Update_Where_set_nullable_int_constant_via_discard_lambda(async);
+
+        AssertExecuteUpdateSql(
+            """
+UPDATE `Products` AS `p`
+SET `p`.`SupplierID` = 1
+WHERE `p`.`ProductID` < 5
+""");
+    }
+
     public override async Task Update_Where_parameter_set_constant(bool async)
     {
         await base.Update_Where_parameter_set_constant(async);
@@ -1652,7 +1664,7 @@ OFFSET @p ROWS
 """);
     }
 
-    /*public override async Task Update_with_select_mixed_entity_scalar_anonymous_projection(bool async)
+    public override async Task Update_with_select_mixed_entity_scalar_anonymous_projection(bool async)
     {
         await base.Update_with_select_mixed_entity_scalar_anonymous_projection(async);
 
@@ -1660,9 +1672,8 @@ OFFSET @p ROWS
             """
 @p='Updated' (Size = 30)
 
-UPDATE [c]
-SET [c].[ContactName] = @p
-FROM [Customers] AS [c]
+UPDATE `Customers` AS `c`
+SET `c`.`ContactName` = @p
 """);
     }
 
@@ -1674,12 +1685,11 @@ public override async Task Update_with_select_scalar_anonymous_projection(bool a
             """
 @p='Updated' (Size = 30)
 
-UPDATE [c]
-SET [c].[ContactName] = @p
-FROM [Customers] AS [c]
+UPDATE `Customers` AS `c`
+SET `c`.`ContactName` = @p
 """);
     }
-    */
+    
     private void AssertSql(params string[] expected)
         => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 
diff --git a/test/EFCore.Jet.FunctionalTests/ComplexTypesTrackingJetTest.cs b/test/EFCore.Jet.FunctionalTests/ComplexTypesTrackingJetTest.cs
index 04d17417..61645e36 100644
--- a/test/EFCore.Jet.FunctionalTests/ComplexTypesTrackingJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/ComplexTypesTrackingJetTest.cs
@@ -266,6 +266,16 @@ public override void Can_detect_swapped_complex_objects_in_collections(bool trac
     {
     }
 
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override void Can_remove_from_complex_collection_with_nested_complex_collection(bool trackFromQuery)
+    {
+    }
+
+    // Fields can't be proxied
+    public override void Can_remove_from_complex_field_collection_with_nested_complex_collection(bool trackFromQuery)
+    {
+    }
+
     // Issue #36175: Complex types with notification change tracking are not supported
     public override void Throws_when_accessing_complex_entries_using_incorrect_cardinality()
     {
@@ -342,6 +352,30 @@ public override void Can_write_original_values_for_properties_of_complex_propert
     {
     }
 
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override Task Can_save_default_values_in_optional_complex_property_with_multiple_properties(bool async)
+        => Task.CompletedTask;
+
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override Task Can_null_complex_property_with_default_values_and_multiple_properties(bool async)
+        => Task.CompletedTask;
+
+    // Fields can't be proxied
+    public override Task Can_change_state_from_Deleted_with_complex_field_collection(EntityState newState, bool async)
+        => Task.CompletedTask;
+
+    // Fields can't be proxied
+    public override Task Can_change_state_from_Deleted_with_complex_field_record_collection(EntityState newState, bool async)
+        => Task.CompletedTask;
+
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override Task Can_change_state_from_Deleted_with_complex_collection(EntityState newState, bool async)
+        => Task.CompletedTask;
+
+    // Issue #36175: Complex types with notification change tracking are not supported
+    public override Task Can_change_state_from_Deleted_with_complex_record_collection(EntityState newState, bool async)
+        => Task.CompletedTask;
+
     public class JetFixture : JetFixtureBase
     {
         protected override string StoreName
diff --git a/test/EFCore.Jet.FunctionalTests/ComputedColumnTest.cs b/test/EFCore.Jet.FunctionalTests/ComputedColumnTest.cs
deleted file mode 100644
index c170642a..00000000
--- a/test/EFCore.Jet.FunctionalTests/ComputedColumnTest.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading.Tasks;
-using EntityFrameworkCore.Jet.Data;
-using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using Microsoft.Extensions.DependencyInjection;
-using Xunit;
-#nullable disable
-namespace EntityFrameworkCore.Jet.FunctionalTests
-{
-    public class ComputedColumnTest : IAsyncLifetime
-    {
-        [ConditionalFact]
-        public void Can_use_computed_columns()
-        {
-            var serviceProvider = new ServiceCollection()
-                .AddEntityFrameworkJet()
-                .BuildServiceProvider(validateScopes: true);
-
-            using var context = new Context(serviceProvider, TestStore.Name);
-            context.Database.EnsureCreatedResiliently();
-
-            var entity = context.Add(
-                new Entity
-                {
-                    P1 = 20,
-                    P2 = 30,
-                    P3 = 80
-                }).Entity;
-
-            context.SaveChanges();
-
-            Assert.Equal(50, entity.P4);
-            Assert.Equal(100, entity.P5);
-        }
-
-        [ConditionalFact]
-        public void Can_use_computed_columns_with_null_values()
-        {
-            var serviceProvider = new ServiceCollection()
-                .AddEntityFrameworkJet()
-                .BuildServiceProvider(validateScopes: true);
-
-            using var context = new Context(serviceProvider, TestStore.Name);
-            context.Database.EnsureCreatedResiliently();
-
-            var entity = context.Add(new Entity { P1 = 20, P2 = 30 }).Entity;
-
-            context.SaveChanges();
-
-            Assert.Equal(50, entity.P4);
-            Assert.Null(entity.P5);
-        }
-
-        private class Context(IServiceProvider serviceProvider, string databaseName) : DbContext
-        {
-            public DbSet<Entity> Entities { get; set; }
-
-            protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-                => optionsBuilder
-                    .UseJet(JetTestStore.CreateConnectionString(databaseName), TestEnvironment.DataAccessProviderFactory, b => b.ApplyConfiguration())
-                    .UseInternalServiceProvider(serviceProvider);
-
-            protected override void OnModelCreating(ModelBuilder modelBuilder)
-            {
-                modelBuilder.Entity<Entity>()
-                    .Property(e => e.P4)
-                    .HasComputedColumnSql("P1 + P2");
-
-                modelBuilder.Entity<Entity>()
-                    .Property(e => e.P5)
-                    .HasComputedColumnSql("P1 + P3");
-            }
-        }
-
-        private class Entity
-        {
-            public int Id { get; set; }
-            public int P1 { get; set; }
-            public int P2 { get; set; }
-            public int? P3 { get; set; }
-            public int P4 { get; set; }
-            public int? P5 { get; set; }
-        }
-
-        [Flags]
-        public enum FlagEnum
-        {
-            None = 0x0,
-            AValue = 0x1,
-            BValue = 0x2
-        }
-
-        public class EnumItem
-        {
-            public int EnumItemId { get; set; }
-            public FlagEnum FlagEnum { get; set; }
-            public FlagEnum? OptionalFlagEnum { get; set; }
-            public FlagEnum? CalculatedFlagEnum { get; set; }
-        }
-
-        private class NullableContext(IServiceProvider serviceProvider, string databaseName) : DbContext
-        {
-            public DbSet<EnumItem> EnumItems { get; set; }
-
-            protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-                => optionsBuilder
-                    .UseJet(JetTestStore.CreateConnectionString(databaseName), TestEnvironment.DataAccessProviderFactory, b => b.ApplyConfiguration())
-                    .UseInternalServiceProvider(serviceProvider);
-
-            protected override void OnModelCreating(ModelBuilder modelBuilder)
-                => modelBuilder.Entity<EnumItem>()
-                    .Property(entity => entity.CalculatedFlagEnum)
-                    .HasComputedColumnSql("FlagEnum | OptionalFlagEnum");
-        }
-
-        [ConditionalFact]
-        public void Can_use_computed_columns_with_nullable_enum()
-        {
-            var serviceProvider = new ServiceCollection()
-                .AddEntityFrameworkJet()
-                .BuildServiceProvider(validateScopes: true);
-
-            using var context = new NullableContext(serviceProvider, TestStore.Name);
-            context.Database.EnsureCreatedResiliently();
-
-            var entity = context.EnumItems.Add(new EnumItem { FlagEnum = FlagEnum.AValue, OptionalFlagEnum = FlagEnum.BValue }).Entity;
-            context.SaveChanges();
-
-            Assert.Equal(FlagEnum.AValue | FlagEnum.BValue, entity.CalculatedFlagEnum);
-        }
-
-        protected JetTestStore TestStore { get; private set; }
-
-        public async Task InitializeAsync()
-            => TestStore = await JetTestStore.CreateInitializedAsync("ComputedColumnTest");
-
-        public async Task DisposeAsync()
-            => await TestStore.DisposeAsync();
-    }
-}
diff --git a/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj b/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj
index 01ab4d65..7aecb8bf 100644
--- a/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj
+++ b/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj
@@ -8,6 +8,14 @@
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<Compile Remove="Scaffolding\Baselines\**\*" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="Scaffolding\Baselines\**\*" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<Compile Include="..\Shared\**\*.cs">
 			<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
@@ -15,7 +23,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.4.0" />
+		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.7.1" />
 		<PackageReference Include="MSTest.TestFramework" />
 		<PackageReference Include="xunit.core" />
 		<PackageReference Include="xunit.assert" />
@@ -106,4 +114,8 @@
 		<Compile Remove="Query\AdHocJsonQueryJetTestBase.cs" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Scaffolding\Baselines\" />
+	</ItemGroup>
+
 </Project>
diff --git a/test/EFCore.Jet.FunctionalTests/F1JetFixture.cs b/test/EFCore.Jet.FunctionalTests/F1JetFixture.cs
index 4f9ca569..19701478 100644
--- a/test/EFCore.Jet.FunctionalTests/F1JetFixture.cs
+++ b/test/EFCore.Jet.FunctionalTests/F1JetFixture.cs
@@ -2,23 +2,97 @@
 
 using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.EntityFrameworkCore.TestModels.ConcurrencyModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+
+#nullable disable
 
 namespace EntityFrameworkCore.Jet.FunctionalTests
 {
-    public class F1ULongJetFixture : F1JetFixtureBase<ulong>
-    {
-    }
-
     public class F1JetFixture : F1JetFixtureBase<byte[]>
     {
+        protected override void BuildModelExternal(ModelBuilder modelBuilder)
+        {
+            base.BuildModelExternal(modelBuilder);
+
+            var converter = new BinaryVersionConverter();
+            var comparer = new BinaryVersionComparer();
+
+            modelBuilder
+                .Entity<Fan>()
+                .Property(e => e.BinaryVersion)
+                .HasConversion(converter, comparer)
+                .IsRowVersion();
+
+            modelBuilder
+                .Entity<FanTpt>()
+                .Property(e => e.BinaryVersion)
+                .HasConversion(converter, comparer)
+                .IsRowVersion();
+
+            modelBuilder
+                .Entity<FanTpc>()
+                .Property(e => e.BinaryVersion)
+                .HasConversion(converter, comparer)
+                .IsRowVersion();
+
+            modelBuilder
+                .Entity<Circuit>()
+                .Property(e => e.BinaryVersion)
+                .HasConversion(converter, comparer)
+                .IsRowVersion();
+
+            modelBuilder
+                .Entity<CircuitTpt>()
+                .Property(e => e.BinaryVersion)
+                .HasConversion(converter, comparer)
+                .IsRowVersion();
+
+            modelBuilder
+                .Entity<CircuitTpc>()
+                .Property(e => e.BinaryVersion)
+                .HasConversion(converter, comparer)
+                .IsRowVersion();
+        }
+
+        private class BinaryVersionConverter() : ValueConverter<List<byte>, byte[]>(
+            v => v == null ? null : v.ToArray(),
+            v => v == null ? null : v.ToList());
+
+        private class BinaryVersionComparer() : ValueComparer<List<byte>>(
+            (l, r) => (l == null && r == null) || (l != null && r != null && l.SequenceEqual(r)),
+            v => CalculateHashCode(v),
+            v => v == null ? null : v.ToList())
+        {
+            private static int CalculateHashCode(List<byte> source)
+            {
+                if (source == null)
+                {
+                    return 0;
+                }
+
+                var hash = new HashCode();
+                foreach (var el in source)
+                {
+                    hash.Add(el);
+                }
+
+                return hash.ToHashCode();
+            }
+        }
     }
 
     public abstract class F1JetFixtureBase<TRowVersion> : F1RelationalFixture<TRowVersion>
     {
-        protected override ITestStoreFactory TestStoreFactory => JetTestStoreFactory.Instance;
-        
+        protected override ITestStoreFactory TestStoreFactory
+            => JetTestStoreFactory.Instance;
+
         public override TestHelpers TestHelpers
             => JetTestHelpers.Instance;
 
@@ -26,27 +100,11 @@ protected override void BuildModelExternal(ModelBuilder modelBuilder)
         {
             base.BuildModelExternal(modelBuilder);
 
-            modelBuilder.Entity<Chassis>().Property<byte[]>("Version").IsRowVersion();
-            modelBuilder.Entity<Driver>().Property<byte[]>("Version").IsRowVersion();
-
-            modelBuilder.Entity<Team>().Property<byte[]>("Version")
-                .ValueGeneratedOnAddOrUpdate()
-                .IsConcurrencyToken();
-
-            modelBuilder.Entity<Sponsor>(
-                eb =>
-                {
-                    eb.Property<byte[]>("Version").IsRowVersion().HasColumnName("Version");
-                    eb.Property<int?>(Sponsor.ClientTokenPropertyName).HasColumnName(Sponsor.ClientTokenPropertyName);
-                });
             modelBuilder.Entity<TitleSponsor>()
                 .OwnsOne(
                     s => s.Details, eb =>
                     {
                         eb.Property(d => d.Space).HasColumnType("decimal(18,2)");
-                        eb.Property<byte[]>("Version").IsRowVersion().HasColumnName("Version");
-                        eb.Property<int?>(Sponsor.ClientTokenPropertyName).IsConcurrencyToken()
-                            .HasColumnName(Sponsor.ClientTokenPropertyName);
                     });
         }
     }
diff --git a/test/EFCore.Jet.FunctionalTests/GraphUpdates/GraphUpdatesJetOwnedTest.cs b/test/EFCore.Jet.FunctionalTests/GraphUpdates/GraphUpdatesJetOwnedTest.cs
index 8a9e62c4..6a84f49e 100644
--- a/test/EFCore.Jet.FunctionalTests/GraphUpdates/GraphUpdatesJetOwnedTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/GraphUpdates/GraphUpdatesJetOwnedTest.cs
@@ -629,6 +629,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
             modelBuilder.Entity<SharedFkRoot>().Property(x => x.Id).HasColumnType("int");
             modelBuilder.Entity<SharedFkDependant>().Property(x => x.Id).HasColumnType("int");
             modelBuilder.Entity<SharedFkParent>().Property(x => x.Id).HasColumnType("int");
+
+            modelBuilder.Entity<EntityZ>().Property(x => x.Id).HasColumnType("int");
         }
     }
 }
diff --git a/test/EFCore.Jet.FunctionalTests/GraphUpdates/GraphUpdatesJetTestBase.cs b/test/EFCore.Jet.FunctionalTests/GraphUpdates/GraphUpdatesJetTestBase.cs
index 78171590..d1e37805 100644
--- a/test/EFCore.Jet.FunctionalTests/GraphUpdates/GraphUpdatesJetTestBase.cs
+++ b/test/EFCore.Jet.FunctionalTests/GraphUpdates/GraphUpdatesJetTestBase.cs
@@ -157,79 +157,77 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         {
             base.OnModelCreating(modelBuilder, context);
 
-            modelBuilder.Entity<AccessState>(
-                b =>
-                {
-                    b.Property(e => e.AccessStateId).ValueGeneratedNever();
-                    b.HasData(new AccessState { AccessStateId = 1 });
-                });
-
-            modelBuilder.Entity<Cruiser>(
-                b =>
-                {
-                    b.Property(e => e.IdUserState).HasDefaultValue(1);
-                    b.HasOne(e => e.UserState).WithMany(e => e.Users).HasForeignKey(e => e.IdUserState);
-                });
-
-            modelBuilder.Entity<AccessStateWithSentinel>(
-                b =>
-                {
-                    b.Property(e => e.AccessStateWithSentinelId).ValueGeneratedNever();
-                    b.HasData(new AccessStateWithSentinel { AccessStateWithSentinelId = 1 });
-                });
-
-            modelBuilder.Entity<CruiserWithSentinel>(
-                b =>
-                {
-                    b.Property(e => e.IdUserState).HasDefaultValue(1).HasSentinel(667);
-                    b.HasOne(e => e.UserState).WithMany(e => e.Users).HasForeignKey(e => e.IdUserState);
-                });
+            modelBuilder.Entity<AccessState>(b =>
+            {
+                b.Property(e => e.AccessStateId).ValueGeneratedNever();
+                b.HasData(new AccessState { AccessStateId = 1 });
+            });
+
+            modelBuilder.Entity<Cruiser>(b =>
+            {
+                b.Property(e => e.IdUserState).HasDefaultValue(1);
+                b.HasOne(e => e.UserState).WithMany(e => e.Users).HasForeignKey(e => e.IdUserState);
+            });
+
+            modelBuilder.Entity<AccessStateWithSentinel>(b =>
+            {
+                b.Property(e => e.AccessStateWithSentinelId).ValueGeneratedNever();
+                b.HasData(new AccessStateWithSentinel { AccessStateWithSentinelId = 1 });
+            });
+
+            modelBuilder.Entity<CruiserWithSentinel>(b =>
+            {
+                b.Property(e => e.IdUserState).HasDefaultValue(1).HasSentinel(667);
+                b.HasOne(e => e.UserState).WithMany(e => e.Users).HasForeignKey(e => e.IdUserState);
+            });
 
             modelBuilder.Entity<SomethingOfCategoryA>().Property<int>("CategoryId").HasDefaultValue(1);
             modelBuilder.Entity<SomethingOfCategoryB>().Property(e => e.CategoryId).HasDefaultValue(2);
 
-            modelBuilder.Entity<StringKeyAndIndexParent>(
-                b =>
-                {
-                    b.HasOne(e => e.Child)
-                        .WithOne(e => e.Parent)
-                        .HasForeignKey<StringKeyAndIndexChild>(e => e.ParentId)
-                        .HasPrincipalKey<StringKeyAndIndexParent>(e => e.AlternateId);
-                });
-
-            modelBuilder.Entity<CompositeKeyWith<int>>(
-                b =>
-                {
+            modelBuilder.Entity<StringKeyAndIndexParent>(b =>
+            {
+                b.HasOne(e => e.Child)
+                    .WithOne(e => e.Parent)
+                    .HasForeignKey<StringKeyAndIndexChild>(e => e.ParentId)
+                    .HasPrincipalKey<StringKeyAndIndexParent>(e => e.AlternateId);
+            });
+
+            modelBuilder.Entity<CompositeKeyWith<int>>(b =>
+            {
                     b.Property(e => e.PrimaryGroup).HasDefaultValue(1).HasSentinel(1);
-                });
+            });
 
-            modelBuilder.Entity<CompositeKeyWith<bool>>(
-                b =>
-                {
+            modelBuilder.Entity<CompositeKeyWith<bool>>(b =>
+            {
                     b.Property(e => e.PrimaryGroup).HasDefaultValue(true);
-                });
+            });
 
-            modelBuilder.Entity<CompositeKeyWith<bool?>>(
-                b =>
-                {
-                    b.Property(e => e.PrimaryGroup).HasDefaultValue(true);
-                });
+            modelBuilder.Entity<CompositeKeyWith<bool?>>(b =>
+            {
+                b.Property(e => e.PrimaryGroup).HasDefaultValue(true);
+            });
 
             modelBuilder.Entity<SharedFkRoot>().Property(x => x.Id).HasColumnType("int");
             modelBuilder.Entity<SharedFkDependant>().Property(x => x.Id).HasColumnType("int");
             modelBuilder.Entity<SharedFkParent>().Property(x => x.Id).HasColumnType("int");
+
+            modelBuilder.Entity<EntityZ>().Property(x => x.Id).HasConversion<int>();
         }
 
         protected override async Task SeedAsync(PoolableDbContext context)
         {
             await base.SeedAsync(context);
 
+            // Jet enforces MATCH FULL semantics for composite foreign keys: every column must be null
+            // or every column must be non-null and satisfy the reference. SQL Server (and EF Core's
+            // test suite) uses MATCH SIMPLE, where any null column bypasses the constraint.
+            // Optional relationships can produce a mixed-null FK state (one column null, one not),
+            // which is valid under MATCH SIMPLE but rejected by Jet, so those composite FK constraints
+            // are dropped here. Required and owned relationships are always fully null or fully non-null
+            // (owned FK columns are PK components and therefore non-nullable), so those FKs are kept.
             await context.Database.ExecuteSqlAsync($"ALTER TABLE `OptionalComposite2` DROP CONSTRAINT `FK_OptionalComposite2_OptionalAk1_ParentId_ParentAlternateId`");
             await context.Database.ExecuteSqlAsync($"ALTER TABLE `OptionalOverlapping2` DROP CONSTRAINT `FK_OptionalOverlapping2_RequiredComposite1_ParentId_ParentAlter~`");
             await context.Database.ExecuteSqlAsync($"ALTER TABLE `OptionalSingleComposite2` DROP CONSTRAINT `FK_OptionalSingleComposite2_OptionalSingleAk1_BackId_ParentAlte~`");
-            await context.Database.ExecuteSqlAsync($"ALTER TABLE `OwnedOptional2` DROP CONSTRAINT `FK_OwnedOptional2_OwnedOptional1_OwnedOptional1OwnerRootId_Owne~`");
-            await context.Database.ExecuteSqlAsync($"ALTER TABLE `OwnedRequired2` DROP CONSTRAINT `FK_OwnedRequired2_OwnedRequired1_OwnedRequired1OwnerRootId_Owne~`");
-            await context.Database.ExecuteSqlAsync($"ALTER TABLE `RequiredComposite2` DROP CONSTRAINT `FK_RequiredComposite2_RequiredAk1_ParentId_ParentAlternateId`");
             await context.Database.ExecuteSqlAsync($"ALTER TABLE `SharedFkParent` DROP CONSTRAINT `FK_SharedFkParent_SharedFkDependant_RootId_DependantId`");
         }
     }
diff --git a/test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_odbc_x86.txt b/test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_odbc_x86.txt
index ef940f6a..3a049b74 100644
--- a/test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_odbc_x86.txt
+++ b/test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_odbc_x86.txt
@@ -18915,40 +18915,6 @@ EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.Deleting_th
 EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.External_model_builder_uses_validation
 EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.Nullable_client_side_concurrency_token_can_be_used
 EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.Property_entry_original_value_is_set
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Adding_the_same_entity_twice_results_in_DbUpdateException
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Attempting_to_add_same_relationship_twice_for_many_to_many_results_in_independent_association_exception
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Attempting_to_delete_same_relationship_twice_for_many_to_many_results_in_independent_association_exception
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_GetDatabaseValues_on_owned_entity_works(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_GetDatabaseValues_on_owned_entity_works(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Deleted_entity_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Deleted_entity_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Deleted_entity_that_is_not_in_database_detaches_it(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Deleted_entity_that_is_not_in_database_detaches_it(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Detached_entity_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Detached_entity_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Detached_entity_that_is_not_in_database_detaches_it(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Detached_entity_that_is_not_in_database_detaches_it(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Modified_entity_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Modified_entity_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Modified_entity_that_is_not_in_database_detaches_it(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Modified_entity_that_is_not_in_database_detaches_it(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Added_entity_that_is_not_in_database_is_no_op(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Added_entity_that_is_not_in_database_is_no_op(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Added_entity_that_was_saved_elsewhere_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Added_entity_that_was_saved_elsewhere_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Unchanged_entity_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Unchanged_entity_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Unchanged_entity_that_is_not_in_database_detaches_it(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Unchanged_entity_that_is_not_in_database_detaches_it(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_owned_entity_works(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_owned_entity_works(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Concurrency_issue_where_the_FK_is_the_concurrency_token_can_be_handled
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Deleting_the_same_entity_twice_results_in_DbUpdateConcurrencyException
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Deleting_then_updating_the_same_entity_results_in_DbUpdateConcurrencyException
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Deleting_then_updating_the_same_entity_results_in_DbUpdateConcurrencyException_which_can_be_resolved_with_store_values
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.External_model_builder_uses_validation
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Nullable_client_side_concurrency_token_can_be_used
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Property_entry_original_value_is_set
 EntityFrameworkCore.Jet.FunctionalTests.OverzealousInitializationJetTest.Fixup_ignores_eagerly_initialized_reference_navs
 EntityFrameworkCore.Jet.FunctionalTests.PropertyValuesJetTest.Complex_collection_current_values_can_be_accessed_as_a_property_dictionary
 EntityFrameworkCore.Jet.FunctionalTests.PropertyValuesJetTest.Complex_collection_original_values_can_be_accessed_as_a_property_dictionary
@@ -21288,7 +21254,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingMiscellaneousJetTest.Where_on_optional_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingMiscellaneousJetTest.Where_property_on_non_nullable_value_type
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingMiscellaneousJetTest.Where_property_on_nullable_value_type_Value
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingPrimitiveCollectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingProjectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
@@ -21391,7 +21356,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.Navigatio
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsMiscellaneousJetTest.Where_on_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsMiscellaneousJetTest.Where_on_nested_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsMiscellaneousJetTest.Where_on_optional_associate_scalar_property
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsPrimitiveCollectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsProjectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
@@ -21470,7 +21434,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.Owne
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsMiscellaneousJetTest.Where_on_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsMiscellaneousJetTest.Where_on_nested_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsMiscellaneousJetTest.Where_on_optional_associate_scalar_property
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsPrimitiveCollectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
@@ -21537,7 +21500,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.Owne
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsStructuralEqualityJetTest.Two_nested_associates
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsStructuralEqualityJetTest.Two_nested_collections
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingMiscellaneousJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingPrimitiveCollectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
diff --git a/test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_oledb_x86.txt b/test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_oledb_x86.txt
index fbf3e98b..ae1b8b76 100644
--- a/test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_oledb_x86.txt
+++ b/test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_oledb_x86.txt
@@ -198,6 +198,8 @@ EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_Where_set_constant(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_Where_set_null(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_Where_set_null(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_Where_set_nullable_int_constant_via_discard_lambda(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_Where_set_nullable_int_constant_via_discard_lambda(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_Where_set_parameter_from_closure_array(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_Where_set_parameter_from_closure_array(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_Where_set_parameter_from_inline_list(async: False)
@@ -230,6 +232,10 @@ EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_with_LeftJoin(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_with_RightJoin(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_with_RightJoin(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_with_select_mixed_entity_scalar_anonymous_projection(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_with_select_mixed_entity_scalar_anonymous_projection(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_with_select_scalar_anonymous_projection(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_with_select_scalar_anonymous_projection(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_with_two_inner_joins(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_with_two_inner_joins(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.BulkUpdates.NorthwindBulkUpdatesJetTest.Update_without_property_to_set_throws(async: False)
@@ -640,6 +646,22 @@ EntityFrameworkCore.Jet.FunctionalTests.CommandInterceptionJetTestBase+CommandIn
 EntityFrameworkCore.Jet.FunctionalTests.CommandInterceptionJetTestBase+CommandInterceptionWithDiagnosticsJetTest.Intercept_scalar_with_one_app_and_one_injected_interceptor(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.CommandInterceptionJetTestBase+CommandInterceptionWithDiagnosticsJetTest.Intercept_scalar_with_two_injected_interceptors(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.CommandInterceptionJetTestBase+CommandInterceptionWithDiagnosticsJetTest.Intercept_scalar_with_two_injected_interceptors(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_collection(newState: Modified, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_collection(newState: Modified, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_collection(newState: Unchanged, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_collection(newState: Unchanged, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_field_collection(newState: Modified, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_field_collection(newState: Modified, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_field_collection(newState: Unchanged, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_field_collection(newState: Unchanged, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_field_record_collection(newState: Modified, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_field_record_collection(newState: Modified, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_field_record_collection(newState: Unchanged, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_field_record_collection(newState: Unchanged, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_record_collection(newState: Modified, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_record_collection(newState: Modified, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_record_collection(newState: Unchanged, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_change_state_from_Deleted_with_complex_record_collection(newState: Unchanged, async: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_detect_added_elements_in_complex_type_collections(trackFromQuery: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_detect_added_elements_in_complex_type_collections(trackFromQuery: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_detect_changes_to_nested_teams_members_in_complex_type_collections(trackFromQuery: False)
@@ -690,6 +712,8 @@ EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_mark_com
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_mark_complex_type_properties_modified_with_fields(trackFromQuery: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_mark_complex_type_properties_modified(trackFromQuery: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_mark_complex_type_properties_modified(trackFromQuery: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_null_complex_property_with_default_values_and_multiple_properties(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_null_complex_property_with_default_values_and_multiple_properties(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_read_original_values_for_properties_of_complex_field_collections(trackFromQuery: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_read_original_values_for_properties_of_complex_field_collections(trackFromQuery: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_read_original_values_for_properties_of_complex_property_bag_collections(trackFromQuery: False)
@@ -714,6 +738,10 @@ EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_read_ori
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_read_original_values_for_properties_of_structs_with_fields(trackFromQuery: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_read_original_values_for_properties_of_structs(trackFromQuery: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_read_original_values_for_properties_of_structs(trackFromQuery: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_remove_from_complex_collection_with_nested_complex_collection(trackFromQuery: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_remove_from_complex_collection_with_nested_complex_collection(trackFromQuery: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_remove_from_complex_field_collection_with_nested_complex_collection(trackFromQuery: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_remove_from_complex_field_collection_with_nested_complex_collection(trackFromQuery: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_save_default_values_in_optional_complex_property_with_multiple_properties(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_save_default_values_in_optional_complex_property_with_multiple_properties(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Can_save_null_second_level_complex_property_with_required_properties(async: False)
@@ -853,6 +881,22 @@ EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Throws_only_
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Throws_only_when_saving_with_null_top_level_complex_property(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Throws_only_when_saving_with_null_top_level_complex_property(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingJetTest.Throws_when_accessing_complex_entries_using_incorrect_cardinality
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_collection(newState: Modified, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_collection(newState: Modified, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_collection(newState: Unchanged, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_collection(newState: Unchanged, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_field_collection(newState: Modified, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_field_collection(newState: Modified, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_field_collection(newState: Unchanged, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_field_collection(newState: Unchanged, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_field_record_collection(newState: Modified, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_field_record_collection(newState: Modified, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_field_record_collection(newState: Unchanged, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_field_record_collection(newState: Unchanged, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_record_collection(newState: Modified, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_record_collection(newState: Modified, async: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_record_collection(newState: Unchanged, async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_change_state_from_Deleted_with_complex_record_collection(newState: Unchanged, async: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_detect_added_elements_in_complex_type_collections(trackFromQuery: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_detect_added_elements_in_complex_type_collections(trackFromQuery: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_detect_changes_to_nested_teams_members_in_complex_type_collections(trackFromQuery: False)
@@ -903,6 +947,8 @@ EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_m
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_mark_complex_type_properties_modified_with_fields(trackFromQuery: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_mark_complex_type_properties_modified(trackFromQuery: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_mark_complex_type_properties_modified(trackFromQuery: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_null_complex_property_with_default_values_and_multiple_properties(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_null_complex_property_with_default_values_and_multiple_properties(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_read_original_values_for_properties_of_complex_field_collections(trackFromQuery: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_read_original_values_for_properties_of_complex_field_collections(trackFromQuery: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_read_original_values_for_properties_of_complex_property_bag_collections(trackFromQuery: False)
@@ -927,6 +973,12 @@ EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_r
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_read_original_values_for_properties_of_structs_with_fields(trackFromQuery: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_read_original_values_for_properties_of_structs(trackFromQuery: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_read_original_values_for_properties_of_structs(trackFromQuery: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_remove_from_complex_collection_with_nested_complex_collection(trackFromQuery: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_remove_from_complex_collection_with_nested_complex_collection(trackFromQuery: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_remove_from_complex_field_collection_with_nested_complex_collection(trackFromQuery: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_remove_from_complex_field_collection_with_nested_complex_collection(trackFromQuery: True)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_save_default_values_in_optional_complex_property_with_multiple_properties(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_save_default_values_in_optional_complex_property_with_multiple_properties(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_save_null_second_level_complex_property_with_required_properties(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_save_null_second_level_complex_property_with_required_properties(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.ComplexTypesTrackingProxiesJetTest.Can_save_null_third_level_complex_property_with_all_optional_properties(async: False)
@@ -4033,6 +4085,8 @@ EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientCascadeTest.Require
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientCascadeTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientCascadeTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientCascadeTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientCascadeTest.Reset_unknown_original_value_when_current_value_is_set(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientCascadeTest.Reset_unknown_original_value_when_current_value_is_set(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientCascadeTest.Resetting_a_deleted_reference_fixes_up_again
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientCascadeTest.Save_changed_optional_one_to_one_with_alternate_key_in_store
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientCascadeTest.Save_changed_optional_one_to_one_with_alternate_key(changeMechanism: 1, useExistingEntities: False, deleteOrphansTiming: Immediate)
@@ -5813,6 +5867,8 @@ EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientNoActionTest.Requir
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientNoActionTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientNoActionTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientNoActionTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientNoActionTest.Reset_unknown_original_value_when_current_value_is_set(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientNoActionTest.Reset_unknown_original_value_when_current_value_is_set(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientNoActionTest.Resetting_a_deleted_reference_fixes_up_again
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientNoActionTest.Save_changed_optional_one_to_one_with_alternate_key_in_store
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetClientNoActionTest.Save_changed_optional_one_to_one_with_alternate_key(changeMechanism: 1, useExistingEntities: False, deleteOrphansTiming: Immediate)
@@ -7362,6 +7418,16 @@ EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_man
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Immediate)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Never)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Immediate, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Never, deleteOrphansTiming: Immediate)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Never, deleteOrphansTiming: Never)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Never, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: null, deleteOrphansTiming: null)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_starting_detached(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_starting_detached(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_starting_detached(cascadeDeleteTiming: Immediate, deleteOrphansTiming: OnSaveChanges)
@@ -7580,6 +7646,8 @@ EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_one
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Reset_unknown_original_value_when_current_value_is_set(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Reset_unknown_original_value_when_current_value_is_set(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Resetting_a_deleted_reference_fixes_up_again
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Save_changed_optional_one_to_one_with_alternate_key_in_store
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetIdentityTest.Save_changed_optional_one_to_one_with_alternate_key(changeMechanism: 1, useExistingEntities: False, deleteOrphansTiming: Immediate)
@@ -9138,6 +9206,16 @@ EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_t
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Immediate)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Never)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Immediate, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Never, deleteOrphansTiming: Immediate)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Never, deleteOrphansTiming: Never)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Never, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: null, deleteOrphansTiming: null)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_starting_detached(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_starting_detached(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_starting_detached(cascadeDeleteTiming: Immediate, deleteOrphansTiming: OnSaveChanges)
@@ -9356,6 +9434,8 @@ EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_one_to
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Reset_unknown_original_value_when_current_value_is_set(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Reset_unknown_original_value_when_current_value_is_set(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Resetting_a_deleted_reference_fixes_up_again
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Save_changed_optional_one_to_one_with_alternate_key_in_store
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetOwnedTest.Save_changed_optional_one_to_one_with_alternate_key(changeMechanism: 1, useExistingEntities: False, deleteOrphansTiming: Immediate)
@@ -10909,6 +10989,16 @@ EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Immediate)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Never)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Immediate, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Never, deleteOrphansTiming: Immediate)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Never, deleteOrphansTiming: Never)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: Never, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: null, deleteOrphansTiming: null)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_in_store(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_starting_detached(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_starting_detached(cascadeDeleteTiming: Immediate, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_many_to_one_dependents_with_alternate_key_are_cascade_deleted_starting_detached(cascadeDeleteTiming: Immediate, deleteOrphansTiming: OnSaveChanges)
@@ -11127,6 +11217,8 @@ EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Immediate)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: Never)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Required_one_to_one_with_alternate_key_are_cascade_detached_when_Added(cascadeDeleteTiming: OnSaveChanges, deleteOrphansTiming: OnSaveChanges)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Reset_unknown_original_value_when_current_value_is_set(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Reset_unknown_original_value_when_current_value_is_set(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Resetting_a_deleted_reference_fixes_up_again
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Save_changed_optional_one_to_one_with_alternate_key_in_store
 EntityFrameworkCore.Jet.FunctionalTests.GraphUpdatesJetTptIdentityTest.Save_changed_optional_one_to_one_with_alternate_key(changeMechanism: 1, useExistingEntities: False, deleteOrphansTiming: Immediate)
@@ -18995,40 +19087,8 @@ EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.Deleting_th
 EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.External_model_builder_uses_validation
 EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.Nullable_client_side_concurrency_token_can_be_used
 EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.Property_entry_original_value_is_set
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Adding_the_same_entity_twice_results_in_DbUpdateException
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Attempting_to_add_same_relationship_twice_for_many_to_many_results_in_independent_association_exception
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Attempting_to_delete_same_relationship_twice_for_many_to_many_results_in_independent_association_exception
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_GetDatabaseValues_on_owned_entity_works(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_GetDatabaseValues_on_owned_entity_works(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Deleted_entity_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Deleted_entity_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Deleted_entity_that_is_not_in_database_detaches_it(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Deleted_entity_that_is_not_in_database_detaches_it(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Detached_entity_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Detached_entity_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Detached_entity_that_is_not_in_database_detaches_it(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Detached_entity_that_is_not_in_database_detaches_it(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Modified_entity_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Modified_entity_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Modified_entity_that_is_not_in_database_detaches_it(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_a_Modified_entity_that_is_not_in_database_detaches_it(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Added_entity_that_is_not_in_database_is_no_op(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Added_entity_that_is_not_in_database_is_no_op(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Added_entity_that_was_saved_elsewhere_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Added_entity_that_was_saved_elsewhere_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Unchanged_entity_makes_the_entity_unchanged(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Unchanged_entity_makes_the_entity_unchanged(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Unchanged_entity_that_is_not_in_database_detaches_it(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_an_Unchanged_entity_that_is_not_in_database_detaches_it(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_owned_entity_works(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Calling_Reload_on_owned_entity_works(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Concurrency_issue_where_the_FK_is_the_concurrency_token_can_be_handled
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Deleting_the_same_entity_twice_results_in_DbUpdateConcurrencyException
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Deleting_then_updating_the_same_entity_results_in_DbUpdateConcurrencyException
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Deleting_then_updating_the_same_entity_results_in_DbUpdateConcurrencyException_which_can_be_resolved_with_store_values
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.External_model_builder_uses_validation
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Nullable_client_side_concurrency_token_can_be_used
-EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyULongJetTest.Property_entry_original_value_is_set
+EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.Row_version_with_TPT_and_owned_types(updateOwnedFirst: True)
+EntityFrameworkCore.Jet.FunctionalTests.OptimisticConcurrencyJetTest.Ulong_row_version_with_TPT_and_table_splitting(updateDependentFirst: True)
 EntityFrameworkCore.Jet.FunctionalTests.OverzealousInitializationJetTest.Fixup_ignores_eagerly_initialized_reference_navs
 EntityFrameworkCore.Jet.FunctionalTests.PropertyValuesJetTest.Complex_collection_current_values_can_be_accessed_as_a_property_dictionary
 EntityFrameworkCore.Jet.FunctionalTests.PropertyValuesJetTest.Complex_collection_original_values_can_be_accessed_as_a_property_dictionary
@@ -21200,10 +21260,18 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocAdvancedMappingsQueryJetTest.
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocAdvancedMappingsQueryJetTest.Setting_IsUnicode_generates_unicode_literal_in_SQL
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocAdvancedMappingsQueryJetTest.Two_similar_complex_properties_projected_with_split_query1
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocAdvancedMappingsQueryJetTest.Two_similar_complex_properties_projected_with_split_query2
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Complex_json_collection_inside_left_join_subquery
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Complex_type_equality_with_non_default_type_mapping
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Complex_type_equals_parameter_with_nested_types_with_property_of_same_name
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Nested_nullable_complex_type_with_discriminator_null_to_non_null_roundtrip
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Non_optional_complex_type_with_all_nullable_properties
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Non_optional_complex_type_with_all_nullable_properties_via_left_join
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Nullable_complex_type_with_discriminator_and_shadow_property
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Nullable_complex_type_with_discriminator_non_null_to_null_roundtrip
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Nullable_complex_type_with_discriminator_null_to_non_null_roundtrip
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Nullable_complex_type_with_discriminator_set_to_different_value
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Nullable_complex_type_with_discriminator_set_to_null
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Nullable_complex_type_with_discriminator_update_non_null_entity_roundtrip
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Optional_complex_type_with_discriminator
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocComplexTypeQueryJetTest.Projecting_complex_property_does_not_auto_include_owned_types
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocManyToManyQueryJetTest.Many_to_many_load_works_when_join_entity_has_custom_key(async: False)
@@ -21228,6 +21296,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Dat
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Discriminator_type_is_handled_correctly
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Entity_equality_with_Contains_and_Parameter(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Entity_equality_with_Contains_and_Parameter(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Enum_has_flag_applies_explicit_cast_for_constant
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Enum_has_flag_does_not_apply_explicit_cast_for_non_constant
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Enum_with_value_converter_matching_take_value(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Enum_with_value_converter_matching_take_value(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Explicitly_compiled_query_does_not_add_cache_entry
@@ -21322,6 +21392,7 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQueryFiltersQueryJetTest.Quer
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQueryFiltersQueryJetTest.Query_filter_with_db_set_should_not_block_other_filters
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQueryFiltersQueryJetTest.Query_filter_with_null_constant
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQueryFiltersQueryJetTest.Query_filter_with_pk_fk_optimization
+EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQueryFiltersQueryJetTest.Query_filter_with_primary_constructor_parameter
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQueryFiltersQueryJetTest.Self_reference_in_query_filter_works
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQueryFiltersQueryJetTest.Weak_entities_with_query_filter_subquery_flattening
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQuerySplittingQueryJetTest.Can_configure_SingleQuery_at_context_level
@@ -21335,60 +21406,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQuerySplittingQueryJetTest.No
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQuerySplittingQueryJetTest.SplitQuery_disposes_inner_data_readers
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQuerySplittingQueryJetTest.Unconfigured_query_splitting_behavior_throws_a_warning
 EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocQuerySplittingQueryJetTest.Using_AsSingleQuery_without_context_configuration_does_not_throw_warning
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Delete_entity_with_associations
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Delete_optional_associate
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Delete_required_associate
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_associate_to_another_associate
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_associate_to_inline
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_associate_to_null
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_associate_to_null_parameter
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_associate_to_null_with_lambda
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_associate_to_parameter
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_associate_with_null_required_property
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_collection_referencing_the_original_collection
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_collection_to_parameter
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_inside_structural_collection
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonBulkUpdateJetTest.Update_required_nested_associate_to_null
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonCollectionJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonCollectionJetTest.Distinct
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonCollectionJetTest.Distinct_over_projected_nested_collection
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonMiscellaneousJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonMiscellaneousJetTest.FromSql_on_root
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonMiscellaneousJetTest.Where_HasValue_on_nullable_value_type
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonPrimitiveCollectionJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_associate(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_non_nullable_value_type(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_non_nullable_value_type(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_nullable_value_type_with_Value(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_nullable_value_type_with_Value(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_nullable_value_type(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_nullable_value_type(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_optional_associate(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_optional_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_required_associate_via_optional_navigation(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_required_associate_via_optional_navigation(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_root_duplicated(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_root_duplicated(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_root_with_value_types(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_root_with_value_types(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_root(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_root(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_unmapped_associate_scalar_property(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_unmapped_associate_scalar_property(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_value_type_property_on_null_associate_throws(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonProjectionJetTest.Select_value_type_property_on_null_associate_throws(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonSetOperationsJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonStructuralEqualityJetTest.Associate_with_inline_null
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonStructuralEqualityJetTest.Associate_with_parameter_null
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonStructuralEqualityJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonStructuralEqualityJetTest.Not_equals
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonStructuralEqualityJetTest.Nullable_value_type_with_null
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson.ComplexJsonStructuralEqualityJetTest.Two_associates
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingBulkUpdateJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingBulkUpdateJetTest.Delete_entity_with_associations
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingBulkUpdateJetTest.Delete_optional_associate
@@ -21429,7 +21446,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingMiscellaneousJetTest.Where_on_optional_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingMiscellaneousJetTest.Where_property_on_non_nullable_value_type
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingMiscellaneousJetTest.Where_property_on_nullable_value_type_Value
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingPrimitiveCollectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingProjectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting.ComplexTableSplittingProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
@@ -21534,7 +21550,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.Navigatio
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsMiscellaneousJetTest.Where_on_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsMiscellaneousJetTest.Where_on_nested_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsMiscellaneousJetTest.Where_on_optional_associate_scalar_property
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsPrimitiveCollectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsProjectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
@@ -21597,50 +21612,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.Navigatio
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsStructuralEqualityJetTest.Two_associates
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsStructuralEqualityJetTest.Two_nested_associates
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations.NavigationsStructuralEqualityJetTest.Two_nested_collections
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonBulkUpdateJetTest.Delete_association
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonBulkUpdateJetTest.Update_association
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonBulkUpdateJetTest.Update_property_inside_association
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonCollectionJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonMiscellaneousJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonMiscellaneousJetTest.FromSql_on_root
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonPrimitiveCollectionJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_associate(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_nested_collection_on_optional_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_nested_collection_on_required_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_optional_associate(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_optional_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_optional_nested_on_optional_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_optional_nested_on_required_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_required_associate_via_optional_navigation(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_required_associate_via_optional_navigation(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_required_nested_on_optional_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_required_nested_on_required_associate(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_root_duplicated(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_root_duplicated(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_root(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_root(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_unmapped_associate_scalar_property(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_unmapped_associate_scalar_property(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_value_type_property_on_null_associate_throws(queryTrackingBehavior: NoTracking)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonProjectionJetTest.Select_value_type_property_on_null_associate_throws(queryTrackingBehavior: TrackAll)
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Associate_with_inline_null
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Associate_with_parameter_null
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Contains_with_inline
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Nested_associate_with_inline
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Nested_associate_with_parameter
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Nested_collection_with_inline
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Nested_collection_with_parameter
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Not_equals
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Two_associates
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Two_nested_associates
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityJetTest.Two_nested_collections
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsCollectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsCollectionJetTest.Count
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsCollectionJetTest.Distinct_over_projected_filtered_nested_collection
@@ -21659,7 +21630,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.Owne
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsMiscellaneousJetTest.Where_on_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsMiscellaneousJetTest.Where_on_nested_associate_scalar_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsMiscellaneousJetTest.Where_on_optional_associate_scalar_property
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsPrimitiveCollectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
@@ -21691,6 +21661,7 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.Owne
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_root(queryTrackingBehavior: TrackAll)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_scalar_property_on_required_associate(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_scalar_property_on_required_associate(queryTrackingBehavior: TrackAll)
+EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_subquery_FirstOrDefault_complex_collection(queryTrackingBehavior: TrackAll)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior: TrackAll)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior: TrackAll)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsProjectionJetTest.Select_unmapped_associate_scalar_property(queryTrackingBehavior: NoTracking)
@@ -21726,7 +21697,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.Owne
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsStructuralEqualityJetTest.Two_nested_associates
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations.OwnedNavigationsStructuralEqualityJetTest.Two_nested_collections
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingMiscellaneousJetTest.Check_all_tests_overridden
-EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingPrimitiveCollectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_associate_collection(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_associate_collection(queryTrackingBehavior: TrackAll)
@@ -21752,6 +21722,7 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.O
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_required_nested_on_required_associate(queryTrackingBehavior: TrackAll)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_scalar_property_on_required_associate(queryTrackingBehavior: NoTracking)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_scalar_property_on_required_associate(queryTrackingBehavior: TrackAll)
+EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_subquery_FirstOrDefault_complex_collection(queryTrackingBehavior: TrackAll)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior: TrackAll)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior: TrackAll)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting.OwnedTableSplittingProjectionJetTest.Select_unmapped_associate_scalar_property(queryTrackingBehavior: NoTracking)
@@ -23069,6 +23040,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.EntitySplittingQueryJetTest.Can_qu
 EntityFrameworkCore.Jet.FunctionalTests.Query.EntitySplittingQueryJetTest.Can_query_entity_which_is_split_selecting_only_part_3_properties(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.EntitySplittingQueryJetTest.Can_query_entity_which_is_split_selecting_only_part_3_properties(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.EntitySplittingQueryJetTest.Check_all_tests_overridden
+EntityFrameworkCore.Jet.FunctionalTests.Query.EntitySplittingQueryJetTest.Compare_split_entity_to_null(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.EntitySplittingQueryJetTest.Compare_split_entity_to_null(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.EntitySplittingQueryJetTest.Custom_projection_trim_when_multiple_tables(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.EntitySplittingQueryJetTest.Custom_projection_trim_when_multiple_tables(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.EntitySplittingQueryJetTest.Include_collection_on_split_entity(async: False)
@@ -24680,6 +24653,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyNoTrackingQueryJetTest.S
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyNoTrackingQueryJetTest.Skip_navigation_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_with_predicate(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_with_predicate(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_without_predicate(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyNoTrackingQueryJetTest.Skip_navigation_of_type_unidirectional(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyNoTrackingQueryJetTest.Skip_navigation_of_type_unidirectional(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyNoTrackingQueryJetTest.Skip_navigation_of_type(async: False)
@@ -24848,6 +24823,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyQueryJetTest.Skip_naviga
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyQueryJetTest.Skip_navigation_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyQueryJetTest.Skip_navigation_long_count_with_predicate(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyQueryJetTest.Skip_navigation_long_count_with_predicate(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyQueryJetTest.Skip_navigation_long_count_without_predicate(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyQueryJetTest.Skip_navigation_long_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyQueryJetTest.Skip_navigation_of_type_unidirectional(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyQueryJetTest.Skip_navigation_of_type_unidirectional(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.ManyToManyQueryJetTest.Skip_navigation_of_type(async: False)
@@ -26415,6 +26392,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindJoinQueryJetTest.GroupJoi
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindJoinQueryJetTest.GroupJoin_simple2(isAsync: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindJoinQueryJetTest.GroupJoin_simple3(isAsync: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindJoinQueryJetTest.GroupJoin_simple3(isAsync: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindJoinQueryJetTest.GroupJoin_subquery_projection_outer_mixed(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindJoinQueryJetTest.GroupJoin_subquery_projection_outer_mixed(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindJoinQueryJetTest.GroupJoin_Subquery_with_Take_Then_SelectMany_Where(isAsync: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindJoinQueryJetTest.GroupJoin_Subquery_with_Take_Then_SelectMany_Where(isAsync: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindJoinQueryJetTest.GroupJoin_Where_OrderBy(isAsync: False)
@@ -26565,6 +26544,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindMiscellaneousQueryJetTest
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindMiscellaneousQueryJetTest.Can_cast_CreateQuery_result_to_IQueryable_T_bug_1730
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindMiscellaneousQueryJetTest.Can_convert_manually_build_expression_with_default(isAsync: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindMiscellaneousQueryJetTest.Can_convert_manually_build_expression_with_default(isAsync: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindMiscellaneousQueryJetTest.Captured_variable_from_switch_case_pattern_matching(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindMiscellaneousQueryJetTest.Captured_variable_from_switch_case_pattern_matching(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindMiscellaneousQueryJetTest.Cast_results_to_object(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindMiscellaneousQueryJetTest.Cast_results_to_object(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindMiscellaneousQueryJetTest.Cast_to_object_over_parameter_directly_in_lambda(async: False)
@@ -27944,6 +27925,10 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQue
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_distinct_is_server_evaluated(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_force_alias_uniquefication(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_force_alias_uniquefication(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_on_additional_from_clause_with_filter(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_on_additional_from_clause_with_filter(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_on_additional_from_clause(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_on_additional_from_clause(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_on_additional_from_clause2(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_on_additional_from_clause2(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_on_join_clause_with_order_by_and_filter(async: False)
@@ -27986,6 +27971,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQue
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_with_client_filter(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_with_conditional_order_by(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_with_conditional_order_by(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_with_cross_join_clause_with_filter(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_with_cross_join_clause_with_filter(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_with_filter_reordered(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_with_filter_reordered(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_collection_with_filter(async: False)
@@ -28006,6 +27993,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQue
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_duplicate_collection_result_operator(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_duplicate_collection_result_operator2(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_duplicate_collection_result_operator2(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_duplicate_collection(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_duplicate_collection(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_duplicate_reference(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_duplicate_reference(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeNoTrackingQueryJetTest.Include_duplicate_reference2(async: False)
@@ -28127,6 +28116,10 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_distinct_is_server_evaluated(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_force_alias_uniquefication(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_force_alias_uniquefication(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_on_additional_from_clause_with_filter(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_on_additional_from_clause_with_filter(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_on_additional_from_clause(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_on_additional_from_clause(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_on_additional_from_clause2(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_on_additional_from_clause2(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_on_join_clause_with_order_by_and_filter(async: False)
@@ -28169,6 +28162,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_with_client_filter(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_with_conditional_order_by(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_with_conditional_order_by(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_with_cross_join_clause_with_filter(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_with_cross_join_clause_with_filter(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_with_filter_reordered(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_with_filter_reordered(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_collection_with_filter(async: False)
@@ -28189,6 +28184,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_duplicate_collection_result_operator(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_duplicate_collection_result_operator2(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_duplicate_collection_result_operator2(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_duplicate_collection(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_duplicate_collection(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_duplicate_reference(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_duplicate_reference(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NorthwindSplitIncludeQueryJetTest.Include_duplicate_reference2(async: False)
@@ -29053,6 +29050,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.NullSemanticsQueryJetTest.Null_sem
 EntityFrameworkCore.Jet.FunctionalTests.Query.NullSemanticsQueryJetTest.Null_semantics_applied_to_CompareTo_equality(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NullSemanticsQueryJetTest.Null_semantics_applied_when_comparing_function_with_nullable_argument_to_a_nullable_column(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NullSemanticsQueryJetTest.Null_semantics_applied_when_comparing_function_with_nullable_argument_to_a_nullable_column(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NullSemanticsQueryJetTest.Null_semantics_applied_when_comparing_two_functions_with_multiple_nullable_arguments(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.NullSemanticsQueryJetTest.Null_semantics_applied_when_comparing_two_functions_with_multiple_nullable_arguments(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NullSemanticsQueryJetTest.Null_semantics_applied_when_comparing_two_functions_with_nullable_arguments(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NullSemanticsQueryJetTest.Null_semantics_applied_when_comparing_two_functions_with_nullable_arguments(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.NullSemanticsQueryJetTest.Null_semantics_coalesce(async: False)
@@ -29671,6 +29670,7 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.PrimitiveCollectionsQueryJetTest.P
 EntityFrameworkCore.Jet.FunctionalTests.Query.PrimitiveCollectionsQueryJetTest.Parameter_collection_of_ints_Contains_nullable_int
 EntityFrameworkCore.Jet.FunctionalTests.Query.PrimitiveCollectionsQueryJetTest.Parameter_collection_of_nullable_ints_Contains_int
 EntityFrameworkCore.Jet.FunctionalTests.Query.PrimitiveCollectionsQueryJetTest.Parameter_collection_of_nullable_ints_Contains_nullable_int
+EntityFrameworkCore.Jet.FunctionalTests.Query.PrimitiveCollectionsQueryJetTest.Parameter_collection_of_nullable_ints_Contains_nullable_int_with_EF_Parameter
 EntityFrameworkCore.Jet.FunctionalTests.Query.PrimitiveCollectionsQueryJetTest.Parameter_collection_of_nullable_strings_Contains_nullable_string
 EntityFrameworkCore.Jet.FunctionalTests.Query.PrimitiveCollectionsQueryJetTest.Parameter_collection_of_nullable_strings_Contains_string
 EntityFrameworkCore.Jet.FunctionalTests.Query.PrimitiveCollectionsQueryJetTest.Parameter_collection_of_nullable_structs_Contains_nullable_struct
@@ -31183,6 +31183,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyNoTrackingQueryJetTes
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyNoTrackingQueryJetTest.Skip_navigation_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_with_predicate(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_with_predicate(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_without_predicate(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyNoTrackingQueryJetTest.Skip_navigation_of_type_unidirectional(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyNoTrackingQueryJetTest.Skip_navigation_of_type_unidirectional(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyNoTrackingQueryJetTest.Skip_navigation_of_type(async: False)
@@ -31352,6 +31354,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyQueryJetTest.Skip_nav
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyQueryJetTest.Skip_navigation_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyQueryJetTest.Skip_navigation_long_count_with_predicate(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyQueryJetTest.Skip_navigation_long_count_with_predicate(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyQueryJetTest.Skip_navigation_long_count_without_predicate(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyQueryJetTest.Skip_navigation_long_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyQueryJetTest.Skip_navigation_of_type_unidirectional(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyQueryJetTest.Skip_navigation_of_type_unidirectional(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPCManyToManyQueryJetTest.Skip_navigation_of_type(async: False)
@@ -32891,6 +32895,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyNoTrackingQueryJetTes
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyNoTrackingQueryJetTest.Skip_navigation_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_with_predicate(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_with_predicate(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_without_predicate(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyNoTrackingQueryJetTest.Skip_navigation_long_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyNoTrackingQueryJetTest.Skip_navigation_of_type_unidirectional(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyNoTrackingQueryJetTest.Skip_navigation_of_type_unidirectional(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyNoTrackingQueryJetTest.Skip_navigation_of_type(async: False)
@@ -33060,6 +33066,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyQueryJetTest.Skip_nav
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyQueryJetTest.Skip_navigation_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyQueryJetTest.Skip_navigation_long_count_with_predicate(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyQueryJetTest.Skip_navigation_long_count_with_predicate(async: True)
+EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyQueryJetTest.Skip_navigation_long_count_without_predicate(async: False)
+EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyQueryJetTest.Skip_navigation_long_count_without_predicate(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyQueryJetTest.Skip_navigation_of_type_unidirectional(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyQueryJetTest.Skip_navigation_of_type_unidirectional(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.TPTManyToManyQueryJetTest.Skip_navigation_of_type(async: False)
@@ -33322,6 +33330,7 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MathTranslationsJetTe
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MathTranslationsJetTest.Truncate_project_and_order_by_it_twice3
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Convert_ToBoolean
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Convert_ToByte
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Convert_ToDouble
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Convert_ToInt16
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Convert_ToInt32
@@ -33336,6 +33345,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslat
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Random_Shared_Next_with_no_args
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Random_Shared_Next_with_one_arg
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Random_Shared_Next_with_two_args
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Sum_over_bool
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.Sum_over_bool_with_ternary
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.TimeSpan_Compare_to_simple_zero(compareTo: False)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.MiscellaneousTranslationsJetTest.TimeSpan_Compare_to_simple_zero(compareTo: True)
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Operators.ArithmeticOperatorTranslationsJetTest.Add
@@ -33435,6 +33446,7 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJet
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.IsNullOrEmpty
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.IsNullOrEmpty_negated
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.IsNullOrWhiteSpace
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Join_non_aggregate
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Join_over_non_nullable_column
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Join_over_nullable_column
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Join_with_ordering
@@ -33464,6 +33476,7 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJet
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Substring_with_one_arg_with_constant
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Substring_with_one_arg_with_parameter
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Substring_with_one_arg_with_zero_startIndex
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Substring_with_two_args_with_IndexOf
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Substring_with_two_args_with_parameter
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Substring_with_two_args_with_zero_length
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.StringTranslationsJetTest.Substring_with_two_args_with_zero_startIndex
@@ -33493,11 +33506,15 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTran
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTranslationsJetTest.FromDateTime_compared_to_constant_and_parameter
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTranslationsJetTest.FromDateTime_compared_to_property
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTranslationsJetTest.Month
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTranslationsJetTest.ToDateTime_constant_DateTime_with_property_TimeOnly
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTranslationsJetTest.ToDateTime_property_with_constant_TimeOnly
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTranslationsJetTest.ToDateTime_property_with_property_TimeOnly
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTranslationsJetTest.ToDateTime_with_complex_DateTime
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTranslationsJetTest.ToDateTime_with_complex_TimeOnly
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateOnlyTranslationsJetTest.Year
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.AddDays
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.AddHours
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.AddMilliseconds
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.AddMinutes
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.AddMonths
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.AddSeconds
@@ -33505,10 +33522,13 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffs
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.Check_all_tests_overridden
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.Day
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.DayOfYear
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.Hour
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.Milliseconds_parameter_and_constant
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.Minute
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.Month
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.Now
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.Second
+EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.TimeOfDay
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.ToUnixTimeSecond
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeOffsetTranslationsJetTest.Year
 EntityFrameworkCore.Jet.FunctionalTests.Query.Translations.Temporal.DateTimeTranslationsJetTest.AddYear
@@ -33702,6 +33722,10 @@ EntityFrameworkCore.Jet.FunctionalTests.SaveChangesInterceptionJetTestBase+SaveC
 EntityFrameworkCore.Jet.FunctionalTests.SaveChangesInterceptionJetTestBase+SaveChangesInterceptionWithDiagnosticsJetTest.Intercept_to_suppress_concurrency_exception(async: True, inject: False, noAcceptChanges: True)
 EntityFrameworkCore.Jet.FunctionalTests.SaveChangesInterceptionJetTestBase+SaveChangesInterceptionWithDiagnosticsJetTest.Intercept_to_suppress_concurrency_exception(async: True, inject: True, noAcceptChanges: False)
 EntityFrameworkCore.Jet.FunctionalTests.SaveChangesInterceptionJetTestBase+SaveChangesInterceptionWithDiagnosticsJetTest.Intercept_to_suppress_concurrency_exception(async: True, inject: True, noAcceptChanges: True)
+EntityFrameworkCore.Jet.FunctionalTests.Scaffolding.CompiledModelJetTest.BigModel
+EntityFrameworkCore.Jet.FunctionalTests.Scaffolding.CompiledModelJetTest.BigModel_with_JSON_columns
+EntityFrameworkCore.Jet.FunctionalTests.Scaffolding.CompiledModelJetTest.CheckConstraints
+EntityFrameworkCore.Jet.FunctionalTests.Scaffolding.CompiledModelJetTest.Throws_for_custom_function_translation
 EntityFrameworkCore.Jet.FunctionalTests.Scaffolding.JetDatabaseModelFactoryTest.Column_nullability_is_set
 EntityFrameworkCore.Jet.FunctionalTests.Scaffolding.JetDatabaseModelFactoryTest.Column_with_sysname_assigns_underlying_store_type_and_nullability
 EntityFrameworkCore.Jet.FunctionalTests.Scaffolding.JetDatabaseModelFactoryTest.ConcurrencyToken_is_set_for_rowVersion
@@ -34716,6 +34740,7 @@ EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendB
 EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendBulkInsertOperation_appends_insert_if_no_store_generated_columns_exist_default_values_only
 EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendDeleteOperation_creates_full_delete_command_text
 EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendDeleteOperation_creates_full_delete_command_text_with_concurrency_check
+EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendInsertOperation_appends_insert_and_select_rowcount_if_no_store_generated_columns_exist_or_conditions_exist
 EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendInsertOperation_for_all_store_generated_columns
 EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendInsertOperation_for_only_identity
 EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendInsertOperation_for_only_single_identity_columns
@@ -34725,12 +34750,17 @@ EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendU
 EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendUpdateOperation_for_computed_property
 EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendUpdateOperation_if_store_generated_columns_dont_exist
 EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.AppendUpdateOperation_if_store_generated_columns_exist
+EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.GenerateNextSequenceValueOperation_correctly_handles_schemas
+EntityFrameworkCore.Jet.FunctionalTests.Update.JetUpdateSqlGeneratorTest.GenerateNextSequenceValueOperation_returns_statement_with_sanitized_sequence
+EntityFrameworkCore.Jet.FunctionalTests.Update.MismatchedKeyTypesJetTest.Can_update_and_delete_composite_keys_mismatched_in_store
+EntityFrameworkCore.Jet.FunctionalTests.Update.MismatchedKeyTypesJetTest.Can_update_and_delete_with_string_FK_and_GUID_PK
+EntityFrameworkCore.Jet.FunctionalTests.Update.MismatchedKeyTypesJetTest.Can_update_and_delete_with_tinyint_FK_and_smallint_PK
+EntityFrameworkCore.Jet.FunctionalTests.Update.MismatchedKeyTypesJetTest.Queries_work_but_SaveChanges_fails_when_composite_keys_incompatible_in_store
+EntityFrameworkCore.Jet.FunctionalTests.Update.MismatchedKeyTypesJetTest.Queries_work_but_SaveChanges_fails_when_keys_incompatible_in_store
 EntityFrameworkCore.Jet.FunctionalTests.Update.NonSharedModelUpdatesJetTest.DbUpdateException_Entries_is_correct_with_multiple_inserts(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Update.NonSharedModelUpdatesJetTest.DbUpdateException_Entries_is_correct_with_multiple_inserts(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Update.NonSharedModelUpdatesJetTest.Principal_and_dependent_roundtrips_with_cycle_breaking(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Update.NonSharedModelUpdatesJetTest.Principal_and_dependent_roundtrips_with_cycle_breaking(async: True)
-EntityFrameworkCore.Jet.FunctionalTests.Update.StoredProcedureUpdateJetTest.Delete(async: False)
-EntityFrameworkCore.Jet.FunctionalTests.Update.StoredProcedureUpdateJetTest.Delete(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Update.StoreValueGenerationIdentityJetTest.Add_Add_with_different_entity_types_and_all_generated_values(async: False)
 EntityFrameworkCore.Jet.FunctionalTests.Update.StoreValueGenerationIdentityJetTest.Add_Add_with_different_entity_types_and_all_generated_values(async: True)
 EntityFrameworkCore.Jet.FunctionalTests.Update.StoreValueGenerationIdentityJetTest.Add_Add_with_different_entity_types_and_generated_values(async: False)
diff --git a/test/EFCore.Jet.FunctionalTests/JetComplianceTest.cs b/test/EFCore.Jet.FunctionalTests/JetComplianceTest.cs
index f4d32c81..a969e463 100644
--- a/test/EFCore.Jet.FunctionalTests/JetComplianceTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/JetComplianceTest.cs
@@ -1,9 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson;
+using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties;
+using Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting;
+using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson;
+using Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting;
 using Microsoft.EntityFrameworkCore.Update;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
 
 namespace EntityFrameworkCore.Jet.FunctionalTests
 {
@@ -21,8 +26,29 @@ public class JetComplianceTest : RelationalComplianceTestBase
             typeof(NonSharedPrimitiveCollectionsQueryTestBase),
             typeof(NonSharedPrimitiveCollectionsQueryRelationalTestBase),
             //No Json query support in Jet
+            typeof(BadDataJsonDeserializationTestBase),
             typeof(JsonQueryTestBase<>),
+            typeof(JsonQueryRelationalTestBase<>),
             typeof(JsonUpdateTestBase<>),
+            typeof(AdHocJsonQueryRelationalTestBase),
+            typeof(AdHocJsonQueryTestBase),
+            typeof(OwnedJsonBulkUpdateRelationalTestBase<>),
+            typeof(OwnedJsonCollectionRelationalTestBase<>),
+            typeof(OwnedJsonMiscellaneousRelationalTestBase<>),
+            typeof(OwnedJsonPrimitiveCollectionRelationalTestBase<>),
+            typeof(OwnedJsonProjectionRelationalTestBase<>),
+            typeof(OwnedJsonStructuralEqualityRelationalTestBase<>),
+            typeof(ComplexJsonBulkUpdateRelationalTestBase<>),
+            typeof(ComplexPropertiesCollectionTestBase<>),
+            typeof(ComplexJsonCollectionRelationalTestBase<>),
+            typeof(ComplexJsonMiscellaneousRelationalTestBase<>),
+            typeof(ComplexJsonPrimitiveCollectionRelationalTestBase<>),
+            typeof(ComplexJsonProjectionRelationalTestBase<>),
+            typeof(ComplexPropertiesSetOperationsTestBase<>),
+            typeof(ComplexJsonSetOperationsRelationalTestBase<>),
+            typeof(ComplexJsonStructuralEqualityRelationalTestBase<>),
+            typeof(OwnedTableSplittingPrimitiveCollectionRelationalTestBase<>),
+            typeof(ComplexTableSplittingPrimitiveCollectionRelationalTestBase<>),
             //Too complex table structure for Jet/MS Access. Too many indexes on table.
             //Caused by having too many navs (foreign keys) on a single table.
             //Also having a primary key (and its related foreign keys) being over more than 14 fields.
@@ -35,6 +61,7 @@ public class JetComplianceTest : RelationalComplianceTestBase
             typeof(UpdatesRelationalTestBase<>),
             //No user defined functions in MS Access/Jet
             typeof(UdfDbFunctionTestBase<>),
+            typeof(StoredProcedureUpdateTestBase),
         ];
 
         protected override Assembly TargetAssembly { get; } = typeof(JetComplianceTest).Assembly;
diff --git a/test/EFCore.Jet.FunctionalTests/JetEndToEndTest.cs b/test/EFCore.Jet.FunctionalTests/JetEndToEndTest.cs
index 4300527c..321437e3 100644
--- a/test/EFCore.Jet.FunctionalTests/JetEndToEndTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/JetEndToEndTest.cs
@@ -37,193 +37,6 @@ public JetEndToEndTest(JetFixture fixture)
             Fixture.TestSqlLoggerFactory.Clear();
         }
 
-        [ConditionalFact]
-        public async Task Can_use_decimal_and_byte_as_identity_columns()
-        {
-            await using var testDatabase = await JetTestStore.CreateInitializedAsync(DatabaseName);
-            var nownNum1 = new NownNum { Id = 77.0m, TheWalrus = "Crying" };
-            var nownNum2 = new NownNum { Id = 78.0m, TheWalrus = "Walrus" };
-
-            var numNum1 = new NumNum { TheWalrus = "I" };
-            var numNum2 = new NumNum { TheWalrus = "Am" };
-
-            var anNum1 = new AnNum { TheWalrus = "Goo goo" };
-            var anNum2 = new AnNum { TheWalrus = "g'joob" };
-
-            var adNum1 = new AdNum { TheWalrus = "Eggman" };
-            var adNum2 = new AdNum { TheWalrus = "Eggmen" };
-
-            var byteNownNum1 = new ByteNownNum { Id = 77, Lucy = "Tangerine" };
-            var byteNownNum2 = new ByteNownNum { Id = 78, Lucy = "Trees" };
-
-            var byteNum1 = new ByteNum { Lucy = "Marmalade" };
-            var byteNum2 = new ByteNum { Lucy = "Skies" };
-
-            var byteAnNum1 = new ByteAnNum { Lucy = "Cellophane" };
-            var byteAnNum2 = new ByteAnNum { Lucy = "Flowers" };
-
-            var byteAdNum1 = new ByteAdNum { Lucy = "Kaleidoscope" };
-            var byteAdNum2 = new ByteAdNum { Lucy = "Eyes" };
-
-            decimal[] preSaveValues;
-            byte[] preSaveByteValues;
-
-            var options = Fixture.CreateOptions(testDatabase);
-            using (var context = new NumNumContext(options))
-            {
-                context.Database.EnsureCreatedResiliently();
-
-                context.AddRange(
-                    nownNum1, nownNum2, numNum1, numNum2, adNum1, adNum2, anNum1, anNum2,
-                    byteNownNum1, byteNownNum2, byteNum1, byteNum2, byteAdNum1, byteAdNum2, byteAnNum1, byteAnNum2);
-
-                preSaveValues = [numNum1.Id, numNum2.Id, adNum1.Id, adNum2.Id, anNum1.Id, anNum2.Id];
-
-                preSaveByteValues = [byteNum1.Id, byteNum2.Id, byteAdNum1.Id, byteAdNum2.Id, byteAnNum1.Id, byteAnNum2.Id];
-
-                context.SaveChanges();
-            }
-
-            using (var context = new NumNumContext(options))
-            {
-                Assert.Equal(nownNum1.Id, context.NownNums.Single(e => e.TheWalrus == "Crying").Id);
-                Assert.Equal(nownNum2.Id, context.NownNums.Single(e => e.TheWalrus == "Walrus").Id);
-                Assert.Equal(77.0m, nownNum1.Id);
-                Assert.Equal(78.0m, nownNum2.Id);
-
-                Assert.Equal(numNum1.Id, context.NumNums.Single(e => e.TheWalrus == "I").Id);
-                Assert.Equal(numNum2.Id, context.NumNums.Single(e => e.TheWalrus == "Am").Id);
-                Assert.NotEqual(numNum1.Id, preSaveValues[0]);
-                Assert.NotEqual(numNum2.Id, preSaveValues[1]);
-
-                Assert.Equal(anNum1.Id, context.AnNums.Single(e => e.TheWalrus == "Goo goo").Id);
-                Assert.Equal(anNum2.Id, context.AnNums.Single(e => e.TheWalrus == "g'joob").Id);
-                Assert.NotEqual(adNum1.Id, preSaveValues[2]);
-                Assert.NotEqual(adNum2.Id, preSaveValues[3]);
-
-                Assert.Equal(adNum1.Id, context.AdNums.Single(e => e.TheWalrus == "Eggman").Id);
-                Assert.Equal(adNum2.Id, context.AdNums.Single(e => e.TheWalrus == "Eggmen").Id);
-                Assert.NotEqual(anNum1.Id, preSaveValues[4]);
-                Assert.NotEqual(anNum2.Id, preSaveValues[5]);
-
-                Assert.Equal(byteNownNum1.Id, context.ByteNownNums.Single(e => e.Lucy == "Tangerine").Id);
-                Assert.Equal(byteNownNum2.Id, context.ByteNownNums.Single(e => e.Lucy == "Trees").Id);
-                Assert.Equal(77, byteNownNum1.Id);
-                Assert.Equal(78, byteNownNum2.Id);
-
-                Assert.Equal(byteNum1.Id, context.ByteNums.Single(e => e.Lucy == "Marmalade").Id);
-                Assert.Equal(byteNum2.Id, context.ByteNums.Single(e => e.Lucy == "Skies").Id);
-                Assert.NotEqual(byteNum1.Id, preSaveByteValues[0]);
-                Assert.NotEqual(byteNum2.Id, preSaveByteValues[1]);
-
-                Assert.Equal(byteAnNum1.Id, context.ByteAnNums.Single(e => e.Lucy == "Cellophane").Id);
-                Assert.Equal(byteAnNum2.Id, context.ByteAnNums.Single(e => e.Lucy == "Flowers").Id);
-                Assert.NotEqual(byteAdNum1.Id, preSaveByteValues[2]);
-                Assert.NotEqual(byteAdNum2.Id, preSaveByteValues[3]);
-
-                Assert.Equal(byteAdNum1.Id, context.ByteAdNums.Single(e => e.Lucy == "Kaleidoscope").Id);
-                Assert.Equal(byteAdNum2.Id, context.ByteAdNums.Single(e => e.Lucy == "Eyes").Id);
-                Assert.NotEqual(byteAnNum1.Id, preSaveByteValues[4]);
-                Assert.NotEqual(byteAnNum2.Id, preSaveByteValues[5]);
-            }
-        }
-
-        private class NumNumContext(DbContextOptions options) : DbContext(options)
-        {
-            public DbSet<NownNum> NownNums { get; set; }
-            public DbSet<NumNum> NumNums { get; set; }
-            public DbSet<AnNum> AnNums { get; set; }
-            public DbSet<AdNum> AdNums { get; set; }
-
-            public DbSet<ByteNownNum> ByteNownNums { get; set; }
-            public DbSet<ByteNum> ByteNums { get; set; }
-            public DbSet<ByteAnNum> ByteAnNums { get; set; }
-            public DbSet<ByteAdNum> ByteAdNums { get; set; }
-
-            protected override void OnModelCreating(ModelBuilder modelBuilder)
-            {
-                modelBuilder
-                    .Entity<NumNum>()
-                    .Property(e => e.Id)
-                    .HasColumnType("numeric(18, 0)")
-                    .UseJetIdentityColumn();
-
-                modelBuilder
-                    .Entity<AdNum>()
-                    .Property(e => e.Id)
-                    .HasColumnType("decimal(10, 0)")
-                    .ValueGeneratedOnAdd();
-
-                modelBuilder
-                    .Entity<ByteNum>()
-                    .Property(e => e.Id)
-                    .UseJetIdentityColumn();
-
-                modelBuilder
-                    .Entity<ByteAdNum>()
-                    .Property(e => e.Id)
-                    .ValueGeneratedOnAdd();
-
-                modelBuilder
-                    .Entity<NownNum>()
-                    .Property(e => e.Id)
-                    .HasColumnType("numeric(18, 0)");
-            }
-        }
-
-        private class NownNum
-        {
-            public decimal Id { get; set; }
-            public string TheWalrus { get; set; }
-        }
-
-        private class NumNum
-        {
-            public decimal Id { get; set; }
-            public string TheWalrus { get; set; }
-        }
-
-        private class AnNum
-        {
-            [Column(TypeName = "decimal(18, 0)")]
-            [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-            public decimal Id { get; set; }
-
-            public string TheWalrus { get; set; }
-        }
-
-        private class AdNum
-        {
-            public decimal Id { get; set; }
-            public string TheWalrus { get; set; }
-        }
-
-        private class ByteNownNum
-        {
-            public byte Id { get; set; }
-            public string Lucy { get; set; }
-        }
-
-        private class ByteNum
-        {
-            public byte Id { get; set; }
-            public string Lucy { get; set; }
-        }
-
-        private class ByteAnNum
-        {
-            [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-            public byte Id { get; set; }
-
-            public string Lucy { get; set; }
-        }
-
-        private class ByteAdNum
-        {
-            public byte Id { get; set; }
-            public string Lucy { get; set; }
-        }
-
         [ConditionalFact]
         public async Task Can_use_string_enum_or_byte_array_as_key()
         {
diff --git a/test/EFCore.Jet.FunctionalTests/LazyLoadProxyJetTest.cs b/test/EFCore.Jet.FunctionalTests/LazyLoadProxyJetTest.cs
index d4647fae..226b1e93 100644
--- a/test/EFCore.Jet.FunctionalTests/LazyLoadProxyJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/LazyLoadProxyJetTest.cs
@@ -11,7 +11,7 @@
 #nullable disable
 namespace EntityFrameworkCore.Jet.FunctionalTests
 {
-    public class LazyLoadProxyJetTest : LazyLoadProxyTestBase<LazyLoadProxyJetTest.LoadJetFixture>
+    public class LazyLoadProxyJetTest : LazyLoadProxyRelationalTestBase<LazyLoadProxyJetTest.LoadJetFixture>
     {
         public LazyLoadProxyJetTest(LoadJetFixture fixture)
             : base(fixture)
@@ -45,7 +45,7 @@ public override void Lazy_load_many_to_one_reference_to_principal(EntityState st
                     : $"""
 @p='707'
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`Id` = {AssertSqlHelper.Parameter("@p")}
 """);
@@ -61,7 +61,7 @@ public override void Lazy_load_one_to_one_reference_to_principal(EntityState sta
                     : $"""
 @p='707'
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`Id` = {AssertSqlHelper.Parameter("@p")}
 """);
@@ -91,7 +91,7 @@ public override void Lazy_load_one_to_one_PK_to_PK_reference_to_principal(Entity
                 $"""
 @p='707'
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`Id` = {AssertSqlHelper.Parameter("@p")}
 """);
@@ -147,7 +147,7 @@ public override void Lazy_load_many_to_one_reference_to_principal_not_found(Enti
                 $"""
 @p='787'
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`Id` = {AssertSqlHelper.Parameter("@p")}
 """);
@@ -161,7 +161,7 @@ public override void Lazy_load_one_to_one_reference_to_principal_not_found(Entit
                 $"""
 @p='787'
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`Id` = {AssertSqlHelper.Parameter("@p")}
 """);
@@ -235,7 +235,7 @@ public override void Lazy_load_many_to_one_reference_to_principal_alternate_key(
                 $"""
 @p='Root' (Size = 255)
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`AlternateId` = {AssertSqlHelper.Parameter("@p")}
 """);
@@ -249,7 +249,7 @@ public override void Lazy_load_one_to_one_reference_to_principal_alternate_key(E
                 $"""
 @p='Root' (Size = 255)
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`AlternateId` = {AssertSqlHelper.Parameter("@p")}
 """);
@@ -307,7 +307,7 @@ public override void Lazy_load_many_to_one_reference_to_principal_shadow_fk(Enti
                     : $"""
 @p='707'
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`Id` = {AssertSqlHelper.Parameter("@p")}
 """);
@@ -323,7 +323,7 @@ public override void Lazy_load_one_to_one_reference_to_principal_shadow_fk(Entit
                     : $"""
 @p='707'
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`Id` = {AssertSqlHelper.Parameter("@p")}
 """);
@@ -381,7 +381,7 @@ public override void Lazy_load_many_to_one_reference_to_principal_composite_key(
 @p='Root' (Size = 255)
 @p1='707'
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`AlternateId` = {AssertSqlHelper.Parameter("@p")} AND `p`.`Id` = {AssertSqlHelper.Parameter("@p1")}
 """);
@@ -396,7 +396,7 @@ public override void Lazy_load_one_to_one_reference_to_principal_composite_key(E
 @p='Root' (Size = 255)
 @p1='707'
 
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 WHERE `p`.`AlternateId` = {AssertSqlHelper.Parameter("@p")} AND `p`.`Id` = {AssertSqlHelper.Parameter("@p1")}
 """);
@@ -455,7 +455,7 @@ public override void Top_level_projection_track_entities_before_passing_to_clien
 
             AssertSql(
                 $"""
-SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating1`, `p`.`Culture_Species1`, `p`.`Culture_Subspecies1`, `p`.`Culture_Validation1`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating1`, `p`.`Milk_Species1`, `p`.`Milk_Subspecies1`, `p`.`Milk_Validation1`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`
+SELECT TOP 1 `p`.`Id`, `p`.`AlternateId`, `p`.`Discriminator`, `p`.`Culture_Rating`, `p`.`Culture_Species`, `p`.`Culture_Subspecies`, `p`.`Culture_Validation`, `p`.`Culture_License_Charge`, `p`.`Culture_License_Title`, `p`.`Culture_License_Tag_Text`, `p`.`Culture_License_Tog_Text`, `p`.`Culture_Manufacturer_Name`, `p`.`Culture_Manufacturer_Rating`, `p`.`Culture_Manufacturer_Tag_Text`, `p`.`Culture_Manufacturer_Tog_Text`, `p`.`Milk_Rating`, `p`.`Milk_Species`, `p`.`Milk_Subspecies`, `p`.`Milk_Validation`, `p`.`Milk_License_Charge`, `p`.`Milk_License_Title`, `p`.`Milk_License_Tag_Text`, `p`.`Milk_License_Tog_Text`, `p`.`Milk_Manufacturer_Name`, `p`.`Milk_Manufacturer_Rating`, `p`.`Milk_Manufacturer_Tag_Text`, `p`.`Milk_Manufacturer_Tog_Text`
 FROM `Parent` AS `p`
 ORDER BY `p`.`Id`
 
@@ -498,25 +498,25 @@ private void AssertSql(string expected)
                     StringSplitOptions.RemoveEmptyEntries)[2][6..];
 
                 var indexMethodEnding = methodCallLine.IndexOf(')') + 1;
-                var testName = methodCallLine[..indexMethodEnding];
+                var testName = methodCallLine.Substring(0, indexMethodEnding);
                 var parts = methodCallLine[indexMethodEnding..].Split(" ", StringSplitOptions.RemoveEmptyEntries);
                 var fileName = parts[1][..^5];
                 var lineNumber = int.Parse(parts[2]);
 
                 var currentDirectory = Directory.GetCurrentDirectory();
-                var logFile = currentDirectory[..(currentDirectory.LastIndexOf(
+                var logFile = currentDirectory.Substring(
+                        0,
+                        currentDirectory.LastIndexOf(
                             $"{Path.DirectorySeparatorChar}artifacts{Path.DirectorySeparatorChar}",
                             StringComparison.Ordinal)
-                        + 1)]
+                        + 1)
                     + "QueryBaseline.txt";
 
                 var testInfo = testName + " : " + lineNumber + FileNewLine;
-                var newBaseLine = $"""
-                                AssertSql(
-                                    {"@\"" + sql.Replace("\"", "\"\"") + "\""});
-                    
+                var newBaseLine = $@"            AssertSql(
+                {"@\"" + sql.Replace("\"", "\"\"") + "\""});
 
-                    """;
+";
 
                 var contents = testInfo + newBaseLine + FileNewLine + "--------------------" + FileNewLine;
 
@@ -537,7 +537,7 @@ private void AssertSql(string expected)
 
         private string Sql { get; set; }
 
-        public class LoadJetFixture : LoadFixtureBase
+        public class LoadJetFixture : LoadRelationalFixtureBase
         {
             public TestSqlLoggerFactory TestSqlLoggerFactory => (TestSqlLoggerFactory)ListLoggerFactory;
             protected override ITestStoreFactory TestStoreFactory => JetTestStoreFactory.Instance;
diff --git a/test/EFCore.Jet.FunctionalTests/Migrations/MigrationsJetTest.cs b/test/EFCore.Jet.FunctionalTests/Migrations/MigrationsJetTest.cs
index b364910c..3a51cfb1 100644
--- a/test/EFCore.Jet.FunctionalTests/Migrations/MigrationsJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Migrations/MigrationsJetTest.cs
@@ -640,24 +640,20 @@ public override async Task Add_column_with_comment()
 """);
     }
 
+    [ConditionalFact(Skip = "Jet does not support collation")]
     public override async Task Add_column_with_collation()
     {
         await base.Add_column_with_collation();
 
-        AssertSql(
-            """
-ALTER TABLE [People] ADD [Name] nvarchar(max) COLLATE German_PhoneBook_CI_AS NULL;
-""");
+        AssertSql("");
     }
 
+    [ConditionalFact(Skip = "Jet does not support collation")]
     public override async Task Add_column_computed_with_collation(bool stored)
     {
         await base.Add_column_computed_with_collation(stored);
 
-        AssertSql(
-            stored
-                ? """ALTER TABLE [People] ADD [Name] AS 'hello' COLLATE German_PhoneBook_CI_AS PERSISTED;"""
-                : """ALTER TABLE [People] ADD [Name] AS 'hello' COLLATE German_PhoneBook_CI_AS;""");
+        AssertSql("");
     }
 
     public override async Task Add_column_shared()
@@ -713,9 +709,8 @@ await Test(
                 var table = Assert.Single(model.Tables);
                 var column = Assert.Single(table.Columns, c => c.Name == "IdentityColumn");
                 Assert.Equal(ValueGenerated.OnAdd, column.ValueGenerated);
-                // TODO: Do we not reverse-engineer identity facets?
-                // Assert.Equal(100, column[SqlServerAnnotationNames.IdentitySeed]);
-                // Assert.Equal(5, column[SqlServerAnnotationNames.IdentityIncrement]);
+                Assert.Equal(100, column[JetAnnotationNames.IdentitySeed]);
+                Assert.Equal(5, column[JetAnnotationNames.IdentityIncrement]);
             });
 
         AssertSql(
@@ -757,18 +752,16 @@ await Test(
                         Assert.Equal("Cats", t.Name);
                         var column = Assert.Single(t.Columns, c => c.Name == "IdentityColumn");
                         Assert.Equal(ValueGenerated.OnAdd, column.ValueGenerated);
-                        // TODO: Do we not reverse-engineer identity facets?
-                        // Assert.Equal(100, column[SqlServerAnnotationNames.IdentitySeed]);
-                        // Assert.Equal(5, column[SqlServerAnnotationNames.IdentityIncrement]);
+                        Assert.Equal(1, column[JetAnnotationNames.IdentitySeed]);
+                        Assert.Equal(2, column[JetAnnotationNames.IdentityIncrement]);
                     },
                     t =>
                     {
                         Assert.Equal("Dogs", t.Name);
                         var column = Assert.Single(t.Columns, c => c.Name == "IdentityColumn");
                         Assert.Equal(ValueGenerated.OnAdd, column.ValueGenerated);
-                        // TODO: Do we not reverse-engineer identity facets?
-                        // Assert.Equal(100, column[SqlServerAnnotationNames.IdentitySeed]);
-                        // Assert.Equal(5, column[SqlServerAnnotationNames.IdentityIncrement]);
+                        Assert.Equal(2, column[JetAnnotationNames.IdentitySeed]);
+                        Assert.Equal(2, column[JetAnnotationNames.IdentityIncrement]);
                     });
             });
 
diff --git a/test/EFCore.Jet.FunctionalTests/OptimisticConcurrencyJetTest.cs b/test/EFCore.Jet.FunctionalTests/OptimisticConcurrencyJetTest.cs
index 3745cf89..f6e3be7e 100644
--- a/test/EFCore.Jet.FunctionalTests/OptimisticConcurrencyJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/OptimisticConcurrencyJetTest.cs
@@ -1,364 +1,388 @@
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.TestModels.ConcurrencyModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
-#nullable disable
+
 // ReSharper disable InconsistentNaming
-namespace EntityFrameworkCore.Jet.FunctionalTests
+namespace EntityFrameworkCore.Jet.FunctionalTests;
+
+#nullable disable
+
+public class OptimisticConcurrencyJetTest(F1JetFixture fixture)
+    : OptimisticConcurrencyJetTestBase<F1JetFixture, byte[]>(fixture)
 {
-    public class OptimisticConcurrencyULongJetTest(F1ULongJetFixture fixture)
-        : OptimisticConcurrencyJetTestBase<F1ULongJetFixture, ulong>(fixture);
+    [ConditionalTheory, InlineData(true), InlineData(false)]
+    public Task Row_version_with_TPH_and_owned_types(bool updateOwnedFirst)
+        => Row_version_with_owned_types<SuperFan, List<byte>>(updateOwnedFirst, Mapping.Tph, "BinaryVersion");
 
-    public class OptimisticConcurrencyJetTest(F1JetFixture fixture)
-        : OptimisticConcurrencyJetTestBase<F1JetFixture, byte[]>(fixture);
+    [ConditionalTheory, InlineData(true), InlineData(false)]
+    public Task Row_version_with_TPT_and_owned_types(bool updateOwnedFirst)
+        => Row_version_with_owned_types<SuperFanTpt, List<byte>>(updateOwnedFirst, Mapping.Tpt, "BinaryVersion");
 
-    public abstract class OptimisticConcurrencyJetTestBase<TFixture, TRowVersion>(TFixture fixture)
-        : OptimisticConcurrencyRelationalTestBase<TFixture, TRowVersion>(fixture)
-        where TFixture : F1RelationalFixture<TRowVersion>, new()
-    {
-        protected enum Mapping
-        {
-            Tph,
-            Tpt,
-            Tpc
-        }
-
-        protected async Task Row_version_with_owned_types<TEntity, TVersion>(bool updateOwnedFirst, Mapping mapping, string propertyName)
-            where TEntity : class, ISuperFan
-        {
-            await using var c = CreateF1Context();
-
-            await c.Database.CreateExecutionStrategy().ExecuteAsync(
-                c, async context =>
-                {
-                    var synthesizedPropertyName = $"_TableSharingConcurrencyTokenConvention_{propertyName}";
+    [ConditionalTheory, InlineData(true), InlineData(false)]
+    public Task Row_version_with_TPC_and_owned_types(bool updateOwnedFirst)
+        => Row_version_with_owned_types<SuperFanTpc, List<byte>>(updateOwnedFirst, Mapping.Tpc, "BinaryVersion");
+
+    [ConditionalTheory, InlineData(true), InlineData(false)]
+    public Task Ulong_row_version_with_TPH_and_table_splitting(bool updateDependentFirst)
+        => Row_version_with_table_splitting<StreetCircuit, City, List<byte>>(updateDependentFirst, Mapping.Tph, "BinaryVersion");
+
+    [ConditionalTheory, InlineData(true), InlineData(false)]
+    public Task Ulong_row_version_with_TPT_and_table_splitting(bool updateDependentFirst)
+        => Row_version_with_table_splitting<StreetCircuitTpt, CityTpt, List<byte>>(updateDependentFirst, Mapping.Tpt, "BinaryVersion");
+
+    [ConditionalTheory, InlineData(true), InlineData(false)]
+    public Task Ulong_row_version_with_TPC_and_table_splitting(bool updateDependentFirst)
+        => Row_version_with_table_splitting<StreetCircuitTpc, CityTpc, List<byte>>(updateDependentFirst, Mapping.Tpc, "BinaryVersion");
+}
 
-                    await using var transaction = BeginTransaction(context.Database);
+public abstract class OptimisticConcurrencyJetTestBase<TFixture, TRowVersion>(TFixture fixture)
+    : OptimisticConcurrencyRelationalTestBase<TFixture, TRowVersion>(fixture)
+    where TFixture : F1RelationalFixture<TRowVersion>, new()
+{
+    protected enum Mapping
+    {
+        Tph,
+        Tpt,
+        Tpc
+    }
 
-                    var fan = context.Set<TEntity>().Single(e => e.Name == "Alice");
+    protected async Task Row_version_with_owned_types<TEntity, TVersion>(bool updateOwnedFirst, Mapping mapping, string propertyName)
+        where TEntity : class, ISuperFan
+    {
+        await using var c = CreateF1Context();
 
-                    var fanEntry = c.Entry(fan);
-                    var swagEntry = fanEntry.Reference(s => s.Swag).TargetEntry!;
-                    var fanVersion1 = fanEntry.Property<TVersion>(propertyName).CurrentValue;
-                    var swagVersion1 = default(TVersion);
+        await c.Database.CreateExecutionStrategy().ExecuteAsync(
+            c, async context =>
+            {
+                var synthesizedPropertyName = $"_TableSharingConcurrencyTokenConvention_{propertyName}";
 
-                    if (mapping == Mapping.Tph) // Issue #29750
-                    {
-                        swagVersion1 = swagEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
+                await using var transaction = BeginTransaction(context.Database);
 
-                        Assert.Equal(fanVersion1, swagVersion1);
-                    }
+                var fan = context.Set<TEntity>().Single(e => e.Name == "Alice");
 
-                    await using var innerContext = CreateF1Context();
-                    UseTransaction(innerContext.Database, transaction);
-                    var fanInner = innerContext.Set<TEntity>().Single(e => e.Name == "Alice");
+                var fanEntry = c.Entry(fan);
+                var swagEntry = fanEntry.Reference(s => s.Swag).TargetEntry!;
+                var fanVersion1 = fanEntry.Property<TVersion>(propertyName).CurrentValue;
+                var swagVersion1 = default(TVersion);
 
-                    if (updateOwnedFirst)
-                    {
-                        fan.Swag.Stuff += "+";
-                        fanInner.Swag.Stuff += "-";
-                    }
-                    else
-                    {
-                        fanInner.Name += "-";
-                        fan.Name += "+";
-                    }
+                if (mapping != Mapping.Tpt) // Issue #22060
+                {
+                    swagVersion1 = swagEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
 
-                    await innerContext.SaveChangesAsync();
+                    Assert.Equal(fanVersion1, swagVersion1);
+                }
 
-                    if (updateOwnedFirst && mapping == Mapping.Tpt) // Issue #22060
-                    {
-                        await context.SaveChangesAsync();
-                        return;
-                    }
+                await using var innerContext = CreateF1Context();
+                UseTransaction(innerContext.Database, transaction);
+                var fanInner = innerContext.Set<TEntity>().Single(e => e.Name == "Alice");
 
-                    await Assert.ThrowsAnyAsync<DbUpdateConcurrencyException>(() => context.SaveChangesAsync());
+                if (updateOwnedFirst)
+                {
+                    fan.Swag.Stuff += "+";
+                    fanInner.Swag.Stuff += "-";
+                }
+                else
+                {
+                    fanInner.Name += "-";
+                    fan.Name += "+";
+                }
 
-                    await fanEntry.ReloadAsync();
-                    await swagEntry.ReloadAsync();
+                await innerContext.SaveChangesAsync();
 
+                if (updateOwnedFirst && mapping == Mapping.Tpt) // Issue #22060
+                {
                     await context.SaveChangesAsync();
+                    return;
+                }
 
-                    var fanVersion2 = fanEntry.Property<TVersion>(propertyName).CurrentValue;
-                    Assert.NotEqual(fanVersion1, fanVersion2);
+                await Assert.ThrowsAnyAsync<DbUpdateConcurrencyException>(() => context.SaveChangesAsync());
 
-                    var swagVersion2 = default(TVersion);
-                    if (mapping == Mapping.Tph) // Issue #29750
-                    {
-                        swagVersion2 = swagEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
-                        Assert.Equal(fanVersion2, swagVersion2);
-                        Assert.NotEqual(swagVersion1, swagVersion2);
-                    }
+                await fanEntry.ReloadAsync();
+                await swagEntry.ReloadAsync();
 
-                    await innerContext.Entry(fanInner).ReloadAsync();
-                    await innerContext.Entry(fanInner.Swag).ReloadAsync();
+                await context.SaveChangesAsync();
 
-                    if (updateOwnedFirst)
-                    {
-                        fanInner.Name += "-";
-                        fan.Name += "+";
-                    }
-                    else
-                    {
-                        fan.Swag.Stuff += "+";
-                        fanInner.Swag.Stuff += "-";
-                    }
+                var fanVersion2 = fanEntry.Property<TVersion>(propertyName).CurrentValue;
+                Assert.NotEqual(fanVersion1, fanVersion2);
 
-                    await innerContext.SaveChangesAsync();
+                var swagVersion2 = default(TVersion);
+                if (mapping != Mapping.Tpt) // Issue #22060
+                {
+                    swagVersion2 = swagEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
+                    Assert.Equal(fanVersion2, swagVersion2);
+                    Assert.NotEqual(swagVersion1, swagVersion2);
+                }
 
-                    if (!updateOwnedFirst && mapping == Mapping.Tpt) // Issue #22060
-                    {
-                        await context.SaveChangesAsync();
-                        return;
-                    }
+                await innerContext.Entry(fanInner).ReloadAsync();
+                await innerContext.Entry(fanInner.Swag).ReloadAsync();
 
-                    await Assert.ThrowsAnyAsync<DbUpdateConcurrencyException>(() => context.SaveChangesAsync());
+                if (updateOwnedFirst)
+                {
+                    fanInner.Name += "-";
+                    fan.Name += "+";
+                }
+                else
+                {
+                    fan.Swag.Stuff += "+";
+                    fanInner.Swag.Stuff += "-";
+                }
 
-                    await fanEntry.ReloadAsync();
-                    await swagEntry.ReloadAsync();
+                await innerContext.SaveChangesAsync();
 
+                if (!updateOwnedFirst && mapping == Mapping.Tpt) // Issue #22060
+                {
                     await context.SaveChangesAsync();
+                    return;
+                }
 
-                    var fanVersion3 = fanEntry.Property<TVersion>(propertyName).CurrentValue;
-                    Assert.NotEqual(fanVersion2, fanVersion3);
-
-                    if (mapping == Mapping.Tph) // Issue #29750
-                    {
-                        var swagVersion3 = swagEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
-                        Assert.Equal(fanVersion3, swagVersion3);
-                        Assert.NotEqual(swagVersion2, swagVersion3);
-                    }
-                });
-        }
-
-        protected async Task Row_version_with_table_splitting<TEntity, TCity, TVersion>(
-            bool updateDependentFirst,
-            Mapping mapping,
-            string propertyName)
-            where TEntity : class, IStreetCircuit<TCity>
-            where TCity : class, ICity
-        {
-            await using var c = CreateF1Context();
-
-            await c.Database.CreateExecutionStrategy().ExecuteAsync(
-                c, async context =>
-                {
-                    var synthesizedPropertyName = $"_TableSharingConcurrencyTokenConvention_{propertyName}";
+                await Assert.ThrowsAnyAsync<DbUpdateConcurrencyException>(() => context.SaveChangesAsync());
 
-                    await using var transaction = BeginTransaction(context.Database);
+                await fanEntry.ReloadAsync();
+                await swagEntry.ReloadAsync();
 
-                    var circuit = context.Set<TEntity>().Include(e => e.City).Single(e => e.Name == "Monaco");
+                await context.SaveChangesAsync();
 
-                    var circuitEntry = c.Entry(circuit);
-                    var cityEntry = circuitEntry.Reference(s => s.City).TargetEntry!;
-                    var circuitVersion1 = circuitEntry.Property<TVersion>(propertyName).CurrentValue;
-                    var cityVersion1 = default(TVersion);
+                var fanVersion3 = fanEntry.Property<TVersion>(propertyName).CurrentValue;
+                Assert.NotEqual(fanVersion2, fanVersion3);
 
-                    if (mapping == Mapping.Tph) // Issue #29750
-                    {
-                        cityVersion1 = cityEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
+                if (mapping != Mapping.Tpt) // Issue #22060
+                {
+                    var swagVersion3 = swagEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
+                    Assert.Equal(fanVersion3, swagVersion3);
+                    Assert.NotEqual(swagVersion2, swagVersion3);
+                }
+            });
+    }
 
-                        Assert.Equal(circuitVersion1, cityVersion1);
-                    }
+    protected async Task Row_version_with_table_splitting<TEntity, TCity, TVersion>(
+        bool updateDependentFirst,
+        Mapping mapping,
+        string propertyName)
+        where TEntity : class, IStreetCircuit<TCity>
+        where TCity : class, ICity
+    {
+        await using var c = CreateF1Context();
 
-                    await using var innerContext = CreateF1Context();
-                    UseTransaction(innerContext.Database, transaction);
-                    var circuitInner = innerContext.Set<TEntity>().Include(e => e.City).Single(e => e.Name == "Monaco");
+        await c.Database.CreateExecutionStrategy().ExecuteAsync(
+            c, async context =>
+            {
+                var synthesizedPropertyName = $"_TableSharingConcurrencyTokenConvention_{propertyName}";
 
-                    if (updateDependentFirst)
-                    {
-                        circuit.City.Name += "+";
-                        circuitInner.City.Name += "-";
-                    }
-                    else
-                    {
-                        circuit.Name += "+";
-                        circuitInner.Name += "-";
-                    }
+                await using var transaction = BeginTransaction(context.Database);
 
-                    await innerContext.SaveChangesAsync();
+                var circuit = context.Set<TEntity>().Include(e => e.City).Single(e => e.Name == "Monaco");
 
-                    if (updateDependentFirst && mapping == Mapping.Tpt) // Issue #22060
-                    {
-                        await context.SaveChangesAsync();
-                        return;
-                    }
+                var circuitEntry = c.Entry(circuit);
+                var cityEntry = circuitEntry.Reference(s => s.City).TargetEntry!;
+                var circuitVersion1 = circuitEntry.Property<TVersion>(propertyName).CurrentValue;
+                var cityVersion1 = default(TVersion);
 
-                    await Assert.ThrowsAnyAsync<DbUpdateConcurrencyException>(() => context.SaveChangesAsync());
+                if (mapping != Mapping.Tpt) // Issue #22060
+                {
+                    cityVersion1 = cityEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
 
-                    await circuitEntry.ReloadAsync();
-                    await cityEntry.ReloadAsync();
+                    Assert.Equal(circuitVersion1, cityVersion1);
+                }
 
-                    await context.SaveChangesAsync();
+                await using var innerContext = CreateF1Context();
+                UseTransaction(innerContext.Database, transaction);
+                var circuitInner = innerContext.Set<TEntity>().Include(e => e.City).Single(e => e.Name == "Monaco");
 
-                    var circuitVersion2 = circuitEntry.Property<TVersion>(propertyName).CurrentValue;
-                    Assert.NotEqual(circuitVersion1, circuitVersion2);
+                if (updateDependentFirst)
+                {
+                    circuit.City.Name += "+";
+                    circuitInner.City.Name += "-";
+                }
+                else
+                {
+                    circuit.Name += "+";
+                    circuitInner.Name += "-";
+                }
 
-                    var cityVersion2 = default(TVersion);
-                    if (mapping == Mapping.Tph) // Issue #29750
-                    {
-                        cityVersion2 = cityEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
-                        Assert.Equal(circuitVersion2, cityVersion2);
-                        Assert.NotEqual(cityVersion1, cityVersion2);
-                    }
+                await innerContext.SaveChangesAsync();
 
-                    await innerContext.Entry(circuitInner).ReloadAsync();
-                    await innerContext.Entry(circuitInner.City).ReloadAsync();
+                if (updateDependentFirst && mapping == Mapping.Tpt) // Issue #22060
+                {
+                    await context.SaveChangesAsync();
+                    return;
+                }
 
-                    if (updateDependentFirst)
-                    {
-                        circuit.Name += "+";
-                        circuitInner.Name += "-";
-                    }
-                    else
-                    {
-                        circuit.City.Name += "+";
-                        circuitInner.City.Name += "-";
-                    }
+                await Assert.ThrowsAnyAsync<DbUpdateConcurrencyException>(() => context.SaveChangesAsync());
 
-                    await innerContext.SaveChangesAsync();
+                await circuitEntry.ReloadAsync();
+                await cityEntry.ReloadAsync();
 
-                    if (!updateDependentFirst && mapping == Mapping.Tpt) // Issue #22060
-                    {
-                        await context.SaveChangesAsync();
-                        return;
-                    }
+                await context.SaveChangesAsync();
 
-                    await Assert.ThrowsAnyAsync<DbUpdateConcurrencyException>(() => context.SaveChangesAsync());
+                var circuitVersion2 = circuitEntry.Property<TVersion>(propertyName).CurrentValue;
+                Assert.NotEqual(circuitVersion1, circuitVersion2);
 
-                    await circuitEntry.ReloadAsync();
-                    await cityEntry.ReloadAsync();
+                var cityVersion2 = default(TVersion);
+                if (mapping != Mapping.Tpt) // Issue #22060
+                {
+                    cityVersion2 = cityEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
+                    Assert.Equal(circuitVersion2, cityVersion2);
+                    Assert.NotEqual(cityVersion1, cityVersion2);
+                }
 
-                    await context.SaveChangesAsync();
+                await innerContext.Entry(circuitInner).ReloadAsync();
+                await innerContext.Entry(circuitInner.City).ReloadAsync();
 
-                    var circuitVersion3 = circuitEntry.Property<TVersion>(propertyName).CurrentValue;
-                    Assert.NotEqual(circuitVersion2, circuitVersion3);
-
-                    if (mapping == Mapping.Tph) // Issue #29750
-                    {
-                        var cityVersion3 = cityEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
-                        Assert.Equal(circuitVersion3, cityVersion3);
-                        Assert.NotEqual(cityVersion2, cityVersion3);
-                    }
-                });
-        }
-
-        [ConditionalFact]
-        public async Task Modifying_concurrency_token_only_is_noop()
-        {
-            using var c = CreateF1Context();
-            await c.Database.CreateExecutionStrategy().ExecuteAsync(
-                c, async context =>
+                if (updateDependentFirst)
+                {
+                    circuit.Name += "+";
+                    circuitInner.Name += "-";
+                }
+                else
+                {
+                    circuit.City.Name += "+";
+                    circuitInner.City.Name += "-";
+                }
+
+                await innerContext.SaveChangesAsync();
+
+                if (!updateDependentFirst && mapping == Mapping.Tpt) // Issue #22060
                 {
-                    using var transaction = context.Database.BeginTransaction();
-                    var driver = context.Drivers.Single(d => d.CarNumber == 1);
-                    driver.Podiums = StorePodiums;
-                    var firstVersion = context.Entry(driver).Property<TRowVersion>("Version").CurrentValue;
                     await context.SaveChangesAsync();
+                    return;
+                }
+
+                await Assert.ThrowsAnyAsync<DbUpdateConcurrencyException>(() => context.SaveChangesAsync());
+
+                await circuitEntry.ReloadAsync();
+                await cityEntry.ReloadAsync();
+
+                await context.SaveChangesAsync();
+
+                var circuitVersion3 = circuitEntry.Property<TVersion>(propertyName).CurrentValue;
+                Assert.NotEqual(circuitVersion2, circuitVersion3);
 
-                    using var innerContext = CreateF1Context();
-                    innerContext.Database.UseTransaction(transaction.GetDbTransaction());
-                    driver = innerContext.Drivers.Single(d => d.CarNumber == 1);
-                    Assert.NotEqual(firstVersion, innerContext.Entry(driver).Property<TRowVersion>("Version").CurrentValue);
-                    Assert.Equal(StorePodiums, driver.Podiums);
-
-                    var secondVersion = innerContext.Entry(driver).Property<TRowVersion>("Version").CurrentValue;
-                    innerContext.Entry(driver).Property<TRowVersion>("Version").CurrentValue = firstVersion;
-                    await innerContext.SaveChangesAsync();
-                    using var validationContext = CreateF1Context();
-                    validationContext.Database.UseTransaction(transaction.GetDbTransaction());
-                    driver = validationContext.Drivers.Single(d => d.CarNumber == 1);
-                    Assert.Equal(secondVersion, validationContext.Entry(driver).Property<TRowVersion>("Version").CurrentValue);
-                    Assert.Equal(StorePodiums, driver.Podiums);
-                });
-        }
-
-        [ConditionalFact]
-        public async Task Database_concurrency_token_value_is_updated_for_all_sharing_entities()
-        {
-            using var c = CreateF1Context();
-            await c.Database.CreateExecutionStrategy().ExecuteAsync(
-                c, async context =>
+                if (mapping != Mapping.Tpt) // Issue #22060
                 {
-                    using var transaction = context.Database.BeginTransaction();
-                    var sponsor = context.Set<TitleSponsor>().Single();
-                    var sponsorEntry = c.Entry(sponsor);
-                    var detailsEntry = sponsorEntry.Reference(s => s.Details).TargetEntry;
-                    var sponsorVersion = sponsorEntry.Property<TRowVersion>("Version").CurrentValue;
-                    var detailsVersion = detailsEntry.Property<TRowVersion>("Version").CurrentValue;
+                    var cityVersion3 = cityEntry.Property<TVersion>(synthesizedPropertyName).CurrentValue;
+                    Assert.Equal(circuitVersion3, cityVersion3);
+                    Assert.NotEqual(cityVersion2, cityVersion3);
+                }
+            });
+    }
 
-                    Assert.Null(sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
-                    sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue = 1;
+    [ConditionalFact]
+    public async Task Modifying_concurrency_token_only_is_noop()
+    {
+        using var c = CreateF1Context();
+        await c.Database.CreateExecutionStrategy().ExecuteAsync(
+            c, async context =>
+            {
+                using var transaction = context.Database.BeginTransaction();
+                var driver = context.Drivers.Single(d => d.CarNumber == 1);
+                driver.Podiums = StorePodiums;
+                var firstVersion = context.Entry(driver).Property<TRowVersion>("Version").CurrentValue;
+                await context.SaveChangesAsync();
+
+                using var innerContext = CreateF1Context();
+                innerContext.Database.UseTransaction(transaction.GetDbTransaction());
+                driver = innerContext.Drivers.Single(d => d.CarNumber == 1);
+                Assert.NotEqual(firstVersion, innerContext.Entry(driver).Property<TRowVersion>("Version").CurrentValue);
+                Assert.Equal(StorePodiums, driver.Podiums);
+
+                var secondVersion = innerContext.Entry(driver).Property<TRowVersion>("Version").CurrentValue;
+                innerContext.Entry(driver).Property<TRowVersion>("Version").CurrentValue = firstVersion;
+                await innerContext.SaveChangesAsync();
+                using var validationContext = CreateF1Context();
+                validationContext.Database.UseTransaction(transaction.GetDbTransaction());
+                driver = validationContext.Drivers.Single(d => d.CarNumber == 1);
+                Assert.Equal(secondVersion, validationContext.Entry(driver).Property<TRowVersion>("Version").CurrentValue);
+                Assert.Equal(StorePodiums, driver.Podiums);
+            });
+    }
 
-                    sponsor.Name = "Telecom";
+    [ConditionalFact]
+    public async Task Database_concurrency_token_value_is_updated_for_all_sharing_entities()
+    {
+        using var c = CreateF1Context();
+        await c.Database.CreateExecutionStrategy().ExecuteAsync(
+            c, async context =>
+            {
+                using var transaction = context.Database.BeginTransaction();
+                var sponsor = context.Set<TitleSponsor>().Single();
+                var sponsorEntry = c.Entry(sponsor);
+                var detailsEntry = sponsorEntry.Reference(s => s.Details).TargetEntry;
+                var sponsorVersion = sponsorEntry.Property<TRowVersion>("Version").CurrentValue;
+                var detailsVersion = detailsEntry.Property<TRowVersion>("Version").CurrentValue;
 
-                    Assert.Equal(sponsorVersion, detailsVersion);
+                Assert.Null(sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
+                sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue = 1;
 
-                    await context.SaveChangesAsync();
+                sponsor.Name = "Telecom";
 
-                    var newSponsorVersion = sponsorEntry.Property<TRowVersion>("Version").CurrentValue;
-                    var newDetailsVersion = detailsEntry.Property<TRowVersion>("Version").CurrentValue;
+                Assert.Equal(sponsorVersion, detailsVersion);
 
-                    Assert.Equal(newSponsorVersion, newDetailsVersion);
-                    Assert.NotEqual(sponsorVersion, newSponsorVersion);
+                await context.SaveChangesAsync();
 
-                    Assert.Equal(1, sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
-                    Assert.Equal(1, detailsEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
-                });
-        }
+                var newSponsorVersion = sponsorEntry.Property<TRowVersion>("Version").CurrentValue;
+                var newDetailsVersion = detailsEntry.Property<TRowVersion>("Version").CurrentValue;
 
-        [ConditionalFact]
-        public async Task Original_concurrency_token_value_is_used_when_replacing_owned_instance()
-        {
-            using var c = CreateF1Context();
-            await c.Database.CreateExecutionStrategy().ExecuteAsync(
-                c, async context =>
-                {
-                    using var transaction = context.Database.BeginTransaction();
-                    var sponsor = context.Set<TitleSponsor>().Single();
-                    var sponsorEntry = c.Entry(sponsor);
-                    var sponsorVersion = sponsorEntry.Property<TRowVersion>("Version").CurrentValue;
+                Assert.Equal(newSponsorVersion, newDetailsVersion);
+                Assert.NotEqual(sponsorVersion, newSponsorVersion);
 
-                    Assert.Null(sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
-                    sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue = 1;
+                Assert.Equal(1, sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
+                Assert.Equal(1, detailsEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
+            });
+    }
 
-                    sponsor.Details = new SponsorDetails { Days = 11, Space = 51m };
+    [ConditionalFact]
+    public async Task Original_concurrency_token_value_is_used_when_replacing_owned_instance()
+    {
+        using var c = CreateF1Context();
+        await c.Database.CreateExecutionStrategy().ExecuteAsync(
+            c, async context =>
+            {
+                using var transaction = context.Database.BeginTransaction();
+                var sponsor = context.Set<TitleSponsor>().Single();
+                var sponsorEntry = c.Entry(sponsor);
+                var sponsorVersion = sponsorEntry.Property<TRowVersion>("Version").CurrentValue;
 
-                    context.ChangeTracker.DetectChanges();
+                Assert.Null(sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
+                sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue = 1;
 
-                    var detailsEntry = sponsorEntry.Reference(s => s.Details).TargetEntry;
-                    detailsEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue = 1;
+                sponsor.Details = new SponsorDetails { Days = 11, Space = 51m };
 
-                    await context.SaveChangesAsync();
+                context.ChangeTracker.DetectChanges();
+
+                var detailsEntry = sponsorEntry.Reference(s => s.Details).TargetEntry;
+                detailsEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue = 1;
 
-                    var newSponsorVersion = sponsorEntry.Property<TRowVersion>("Version").CurrentValue;
-                    var newDetailsVersion = detailsEntry.Property<TRowVersion>("Version").CurrentValue;
+                await context.SaveChangesAsync();
 
-                    Assert.Equal(newSponsorVersion, newDetailsVersion);
-                    Assert.NotEqual(sponsorVersion, newSponsorVersion);
+                var newSponsorVersion = sponsorEntry.Property<TRowVersion>("Version").CurrentValue;
+                var newDetailsVersion = detailsEntry.Property<TRowVersion>("Version").CurrentValue;
 
-                    Assert.Equal(1, sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
-                    Assert.Equal(1, detailsEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
-                });
-        }
+                Assert.Equal(newSponsorVersion, newDetailsVersion);
+                Assert.NotEqual(sponsorVersion, newSponsorVersion);
 
-        public override void Property_entry_original_value_is_set()
-        {
-            base.Property_entry_original_value_is_set();
+                Assert.Equal(1, sponsorEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
+                Assert.Equal(1, detailsEntry.Property<int?>(Sponsor.ClientTokenPropertyName).CurrentValue);
+            });
+    }
 
-            AssertSql(
-                """
+    public override void Property_entry_original_value_is_set()
+    {
+        base.Property_entry_original_value_is_set();
+
+        AssertSql(
+            """
 SELECT TOP 1 `e`.`Id`, `e`.`EngineSupplierId`, `e`.`Name`, `e`.`StorageLocation_Latitude`, `e`.`StorageLocation_Longitude`
 FROM `Engines` AS `e`
 ORDER BY `e`.`Id`
 """,
-                //
-                """
+            //
+            """
 @p0='FO 108X' (Size = 255)
 @p1='1'
 @p2='Mercedes' (Size = 255)
@@ -370,12 +394,11 @@ ORDER BY `e`.`Id`
 WHERE `Id` = @p1 AND `EngineSupplierId` = @p2 AND `Name` = @p3 AND `StorageLocation_Latitude` = @p4 AND `StorageLocation_Longitude` = @p5;
 SELECT @@ROWCOUNT;
 """);
-        }
+    }
 
-        private void AssertSql(params string[] expected)
-            => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
+    private void AssertSql(params string[] expected)
+        => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 
-        protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
-            => facade.UseTransaction(transaction.GetDbTransaction());
-    }
+    protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
+        => facade.UseTransaction(transaction.GetDbTransaction());
 }
diff --git a/test/EFCore.Jet.FunctionalTests/Query/AdHocComplexTypeQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/AdHocComplexTypeQueryJetTest.cs
index c7458c90..594ed1aa 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/AdHocComplexTypeQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/AdHocComplexTypeQueryJetTest.cs
@@ -9,7 +9,7 @@
 
 namespace EntityFrameworkCore.Jet.FunctionalTests.Query;
 
-public class AdHocComplexTypeQueryJetTest(NonSharedFixture fixture) : AdHocComplexTypeQueryTestBase(fixture)
+public class AdHocComplexTypeQueryJetTest(NonSharedFixture fixture) : AdHocComplexTypeQueryRelationalTestBase(fixture)
 {
     public override async Task Complex_type_equals_parameter_with_nested_types_with_property_of_same_name()
     {
@@ -27,6 +27,29 @@ public override async Task Complex_type_equals_parameter_with_nested_types_with_
 """);
     }
 
+    public override async Task Projecting_complex_property_does_not_auto_include_owned_types()
+    {
+        await base.Projecting_complex_property_does_not_auto_include_owned_types();
+
+        AssertSql(
+            """
+SELECT `e`.`Complex_Name`, `e`.`Complex_Number`
+FROM `EntityType` AS `e`
+""");
+    }
+
+    public override async Task Complex_type_equality_with_non_default_type_mapping()
+    {
+        await base.Complex_type_equality_with_non_default_type_mapping();
+
+        AssertSql(
+            """
+SELECT COUNT(*)
+FROM `EntityType` AS `e`
+WHERE `e`.`ComplexThing_DateTime` = #2020-01-01 01:01:01#
+""");
+    }
+
     protected TestSqlLoggerFactory TestSqlLoggerFactory
         => (TestSqlLoggerFactory)ListLoggerFactory;
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/AdHocMiscellaneousQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/AdHocMiscellaneousQueryJetTest.cs
index 12801f97..e7ba3d54 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/AdHocMiscellaneousQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/AdHocMiscellaneousQueryJetTest.cs
@@ -962,37 +962,49 @@ public override async Task New_instances_in_projection_are_not_shared_across_res
 
     public override async Task Enum_has_flag_applies_explicit_cast_for_constant()
     {
-        await base.Enum_has_flag_applies_explicit_cast_for_constant();
+        var contextFactory = await InitializeAsync<Context8538>(seed: c => c.SeedAsync());
+        //Context8538.Permission is Int64 and ontext8538.Permission.READ_WRITE is 36 bit and jet/ace cant do maths on bigint/decimal
+        /*using (var context = contextFactory.CreateContext())
+        {
+            var query = context.Entities.Where(e => e.Permission.HasFlag(Context8538.Permission.READ_WRITE)).ToList();
+            Assert.Single(query);
+        }*/
+
+        using (var context = contextFactory.CreateContext())
+        {
+            var query = context.Entities.Where(e => e.PermissionShort.HasFlag(Context8538.PermissionShort.READ_WRITE)).ToList();
+            Assert.Single(query);
+        }
 
         AssertSql(
             """
-SELECT [e].[Id], [e].[Permission], [e].[PermissionByte], [e].[PermissionShort]
-FROM [Entities] AS [e]
-WHERE [e].[Permission] & CAST(17179869184 AS bigint) = CAST(17179869184 AS bigint)
-""",
-            //
-            """
-SELECT [e].[Id], [e].[Permission], [e].[PermissionByte], [e].[PermissionShort]
-FROM [Entities] AS [e]
-WHERE [e].[PermissionShort] & CAST(4 AS smallint) = CAST(4 AS smallint)
+SELECT `e`.`Id`, `e`.`Permission`, `e`.`PermissionByte`, `e`.`PermissionShort`
+FROM `Entities` AS `e`
+WHERE (`e`.`PermissionShort` BAND 4) = 4
 """);
     }
 
     public override async Task Enum_has_flag_does_not_apply_explicit_cast_for_non_constant()
     {
-        await base.Enum_has_flag_does_not_apply_explicit_cast_for_non_constant();
+        var contextFactory = await InitializeAsync<Context8538>(seed: c => c.SeedAsync());
+
+        /*using (var context = contextFactory.CreateContext())
+        {
+            var query = context.Entities.Where(e => e.Permission.HasFlag(e.Permission)).ToList();
+            Assert.Equal(3, query.Count);
+        }*/
+
+        using (var context = contextFactory.CreateContext())
+        {
+            var query = context.Entities.Where(e => e.PermissionByte.HasFlag(e.PermissionByte)).ToList();
+            Assert.Equal(3, query.Count);
+        }
 
         AssertSql(
             """
-SELECT [e].[Id], [e].[Permission], [e].[PermissionByte], [e].[PermissionShort]
-FROM [Entities] AS [e]
-WHERE [e].[Permission] & [e].[Permission] = [e].[Permission]
-""",
-            //
-            """
-SELECT [e].[Id], [e].[Permission], [e].[PermissionByte], [e].[PermissionShort]
-FROM [Entities] AS [e]
-WHERE [e].[PermissionByte] & [e].[PermissionByte] = [e].[PermissionByte]
+SELECT `e`.`Id`, `e`.`Permission`, `e`.`PermissionByte`, `e`.`PermissionShort`
+FROM `Entities` AS `e`
+WHERE (`e`.`PermissionByte` BAND `e`.`PermissionByte`) = `e`.`PermissionByte`
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonBulkUpdateJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonBulkUpdateJetTest.cs
deleted file mode 100644
index 34a17296..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonBulkUpdateJetTest.cs
+++ /dev/null
@@ -1,435 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson;
-
-public class ComplexJsonBulkUpdateJetTest(
-    ComplexJsonJetFixture fixture,
-    ITestOutputHelper testOutputHelper)
-    : ComplexJsonBulkUpdateRelationalTestBase<ComplexJsonJetFixture>(fixture, testOutputHelper)
-{
-    #region Delete
-
-    public override async Task Delete_entity_with_associations()
-    {
-        await base.Delete_entity_with_associations();
-
-        AssertSql(
-            """
-@deletableEntity_Name='Root3_With_different_values' (Size = 255)
-
-DELETE FROM `RootEntity` AS `r`
-WHERE `r`.`Name` = @deletableEntity_Name
-""");
-    }
-
-    public override async Task Delete_required_associate()
-    {
-        await base.Delete_required_associate();
-
-        AssertSql();
-    }
-
-    public override async Task Delete_optional_associate()
-    {
-        await base.Delete_optional_associate();
-
-        AssertSql();
-    }
-
-    #endregion Delete
-
-    #region Update properties
-
-    public override async Task Update_property_inside_associate()
-    {
-        await base.Update_property_inside_associate();
-
-        AssertExecuteUpdateSql(
-                """
-@p='foo_updated' (Size = 4000)
-
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.String', @p)
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_property_inside_associate_with_special_chars()
-    {
-        await base.Update_property_inside_associate_with_special_chars();
-
-        AssertExecuteUpdateSql(
-                """
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.String', N'{ Some other/JSON:like text though it [isn''t]: ממש ממש לאéèéè }')
-FROM [RootEntity] AS [r]
-WHERE JSON_VALUE([r].[RequiredAssociate], '$.String') = N'{ this may/look:like JSON but it [isn''t]: ממש ממש לאéèéè }'
-""");
-    }
-
-    public override async Task Update_property_inside_nested_associate()
-    {
-        await base.Update_property_inside_nested_associate();
-
-        AssertExecuteUpdateSql(
-                """
-@p='foo_updated' (Size = 4000)
-
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.RequiredNestedAssociate.String', @p)
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_property_on_projected_associate()
-    {
-        await base.Update_property_on_projected_associate();
-
-        AssertExecuteUpdateSql(
-                """
-@p='foo_updated' (Size = 4000)
-
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.String', @p)
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_property_on_projected_associate_with_OrderBy_Skip()
-    {
-        await base.Update_property_on_projected_associate_with_OrderBy_Skip();
-
-        AssertExecuteUpdateSql();
-    }
-
-    public override async Task Update_associate_with_null_required_property()
-    {
-        await base.Update_associate_with_null_required_property();
-
-        AssertExecuteUpdateSql();
-    }
-
-    #endregion Update properties
-
-    #region Update association
-
-    public override async Task Update_associate_to_parameter()
-    {
-        await base.Update_associate_to_parameter();
-
-        AssertExecuteUpdateSql(
-            """
-@complex_type_p='{"Id":1000,"Int":80,"Ints":[1,2,3],"Name":"Updated associate name","String":"Updated nested string","NestedCollection":[],"OptionalNestedAssociate":null,"RequiredNestedAssociate":{"Id":1000,"Int":80,"Ints":[1,2,3],"Name":"Updated nested name","String":"Updated nested string"}}' (Size = 277)
-
-UPDATE `RootEntity` AS `r`
-SET `r`.`RequiredAssociate` = @complex_type_p
-""");
-    }
-
-    public override async Task Update_nested_associate_to_parameter()
-    {
-        await base.Update_nested_associate_to_parameter();
-
-        AssertExecuteUpdateSql(
-                """
-@complex_type_p='{"Id":1000,"Int":80,"Ints":[1,2,4],"Name":"Updated nested name","String":"Updated nested string"}' (Size = 97)
-
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.RequiredNestedAssociate', JSON_QUERY(@complex_type_p))
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_associate_to_another_associate()
-    {
-        await base.Update_associate_to_another_associate();
-
-        AssertExecuteUpdateSql(
-            """
-UPDATE `RootEntity` AS `r`
-SET `r`.`OptionalAssociate` = `r`.`RequiredAssociate`
-""");
-    }
-
-    public override async Task Update_nested_associate_to_another_nested_associate()
-    {
-        await base.Update_nested_associate_to_another_nested_associate();
-
-        AssertExecuteUpdateSql(
-                """
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.OptionalNestedAssociate', JSON_QUERY([r].[RequiredAssociate], '$.RequiredNestedAssociate'))
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_associate_to_inline()
-    {
-        await base.Update_associate_to_inline();
-
-        AssertExecuteUpdateSql(
-            """
-@complex_type_p='{"Id":1000,"Int":70,"Ints":[1,2,4],"Name":"Updated associate name","String":"Updated associate string","NestedCollection":[],"OptionalNestedAssociate":null,"RequiredNestedAssociate":{"Id":1000,"Int":80,"Ints":[1,2,4],"Name":"Updated nested name","String":"Updated nested string"}}' (Size = 280)
-
-UPDATE `RootEntity` AS `r`
-SET `r`.`RequiredAssociate` = @complex_type_p
-""");
-    }
-
-    public override async Task Update_associate_to_inline_with_lambda()
-    {
-        await base.Update_associate_to_inline_with_lambda();
-
-        AssertExecuteUpdateSql(
-            """
-UPDATE [r]
-SET [r].[RequiredAssociate] = '{"Id":1000,"Int":70,"Ints":[1,2,4],"Name":"Updated associate name","String":"Updated associate string","NestedCollection":[],"OptionalNestedAssociate":null,"RequiredNestedAssociate":{"Id":1000,"Int":80,"Ints":[1,2,4],"Name":"Updated nested name","String":"Updated nested string"}}'
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_nested_associate_to_inline_with_lambda()
-    {
-        await base.Update_nested_associate_to_inline_with_lambda();
-
-        AssertExecuteUpdateSql(
-                """
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.RequiredNestedAssociate', JSON_QUERY('{"Id":1000,"Int":80,"Ints":[1,2,4],"Name":"Updated nested name","String":"Updated nested string"}'))
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_associate_to_null()
-    {
-        await base.Update_associate_to_null();
-
-        AssertExecuteUpdateSql(
-            """
-UPDATE `RootEntity` AS `r`
-SET `r`.`OptionalAssociate` = NULL
-""");
-    }
-
-    public override async Task Update_associate_to_null_with_lambda()
-    {
-        await base.Update_associate_to_null_with_lambda();
-
-        AssertExecuteUpdateSql(
-            """
-UPDATE `RootEntity` AS `r`
-SET `r`.`OptionalAssociate` = NULL
-""");
-    }
-
-    public override async Task Update_associate_to_null_parameter()
-    {
-        await base.Update_associate_to_null_parameter();
-
-        AssertExecuteUpdateSql(
-            """
-UPDATE `RootEntity` AS `r`
-SET `r`.`OptionalAssociate` = NULL
-""");
-    }
-
-    public override async Task Update_required_nested_associate_to_null()
-    {
-        await base.Update_required_nested_associate_to_null();
-
-        AssertExecuteUpdateSql();
-    }
-
-    #endregion Update association
-
-    #region Update collection
-
-    public override async Task Update_collection_to_parameter()
-    {
-        await base.Update_collection_to_parameter();
-
-        AssertExecuteUpdateSql(
-            """
-@complex_type_p='[{"Id":1000,"Int":80,"Ints":[1,2,4],"Name":"Updated associate name1","String":"Updated associate string1","NestedCollection":[],"OptionalNestedAssociate":null,"RequiredNestedAssociate":{"Id":1000,"Int":80,"Ints":[1,2,4],"Name":"Updated nested name1","String":"Updated nested string1"}},{"Id":1001,"Int":81,"Ints":[1,2,4],"Name":"Updated associate name2","String":"Updated associate string2","NestedCollection":[],"OptionalNestedAssociate":null,"RequiredNestedAssociate":{"Id":1001,"Int":81,"Ints":[1,2,4],"Name":"Updated nested name2","String":"Updated nested string2"}}]' (Size = 571)
-
-UPDATE `RootEntity` AS `r`
-SET `r`.`AssociateCollection` = @complex_type_p
-""");
-    }
-
-    public override async Task Update_nested_collection_to_parameter()
-    {
-        await base.Update_nested_collection_to_parameter();
-
-        AssertExecuteUpdateSql(
-                """
-@complex_type_p='[{"Id":1000,"Int":80,"Ints":[1,2,4],"Name":"Updated nested name1","String":"Updated nested string1"},{"Id":1001,"Int":81,"Ints":[1,2,4],"Name":"Updated nested name2","String":"Updated nested string2"}]' (Size = 201)
-
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.NestedCollection', JSON_QUERY(@complex_type_p))
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_nested_collection_to_inline_with_lambda()
-    {
-        await base.Update_nested_collection_to_inline_with_lambda();
-
-        AssertExecuteUpdateSql(
-                """
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.NestedCollection', JSON_QUERY('[{"Id":1000,"Int":80,"Ints":[1,2,4],"Name":"Updated nested name1","String":"Updated nested string1"},{"Id":1001,"Int":81,"Ints":[1,2,4],"Name":"Updated nested name2","String":"Updated nested string2"}]'))
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_nested_collection_to_another_nested_collection()
-    {
-        await base.Update_nested_collection_to_another_nested_collection();
-
-        AssertExecuteUpdateSql(
-                """
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.NestedCollection', JSON_QUERY([r].[OptionalAssociate], '$.NestedCollection'))
-FROM [RootEntity] AS [r]
-WHERE [r].[OptionalAssociate] IS NOT NULL
-""");
-    }
-
-    public override async Task Update_collection_referencing_the_original_collection()
-    {
-        await base.Update_collection_referencing_the_original_collection();
-
-        AssertExecuteUpdateSql();
-    }
-
-    public override async Task Update_inside_structural_collection()
-    {
-        await base.Update_inside_structural_collection();
-
-        AssertExecuteUpdateSql();
-    }
-
-    #endregion Update collection
-
-    #region Update primitive collection
-
-    public override async Task Update_primitive_collection_to_constant()
-    {
-        await base.Update_primitive_collection_to_constant();
-
-        AssertExecuteUpdateSql(
-                """
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.Ints', JSON_QUERY(N'[1,2,4]'))
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_primitive_collection_to_parameter()
-    {
-        await base.Update_primitive_collection_to_parameter();
-
-        AssertExecuteUpdateSql(
-                """
-@ints='[1,2,4]' (Size = 4000)
-
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.Ints', JSON_QUERY(@ints))
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_primitive_collection_to_another_collection()
-    {
-        await base.Update_primitive_collection_to_another_collection();
-
-        AssertExecuteUpdateSql(
-                """
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.OptionalNestedAssociate.Ints', JSON_QUERY([r].[RequiredAssociate], '$.RequiredNestedAssociate.Ints'))
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_inside_primitive_collection()
-    {
-        await base.Update_inside_primitive_collection();
-
-        AssertExecuteUpdateSql(
-                """
-@p='99'
-
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.Ints[1]', @p)
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) AS [i]) >= 2
-""");
-    }
-
-    #endregion Update primitive collection
-
-    #region Multiple updates
-
-    public override async Task Update_multiple_properties_inside_same_associate()
-    {
-        await base.Update_multiple_properties_inside_same_associate();
-
-        // Note that since two properties within the same JSON column are updated, SQL Server 2025 modify
-        // is not used (it only supports modifying a single property)
-        AssertExecuteUpdateSql(
-            """
-@p='foo_updated' (Size = 4000)
-@p0='20'
-
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY(JSON_MODIFY([r].[RequiredAssociate], '$.String', @p), '$.Int', @p0)
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Update_multiple_properties_inside_associates_and_on_entity_type()
-    {
-        await base.Update_multiple_properties_inside_associates_and_on_entity_type();
-
-        AssertExecuteUpdateSql(
-                """
-@p='foo_updated' (Size = 4000)
-
-UPDATE [r]
-SET [r].[Name] = [r].[Name] + N'Modified',
-    [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.String', JSON_VALUE([r].[OptionalAssociate], '$.String')),
-    [r].[OptionalAssociate] = JSON_MODIFY([r].[OptionalAssociate], '$.RequiredNestedAssociate.String', @p)
-FROM [RootEntity] AS [r]
-WHERE [r].[OptionalAssociate] IS NOT NULL
-""");
-    }
-
-    public override async Task Update_multiple_projected_associates_via_anonymous_type()
-    {
-        await base.Update_multiple_projected_associates_via_anonymous_type();
-
-        AssertExecuteUpdateSql(
-                """
-@p='foo_updated' (Size = 4000)
-
-UPDATE [r]
-SET [r].[RequiredAssociate] = JSON_MODIFY([r].[RequiredAssociate], '$.String', JSON_VALUE([r].[OptionalAssociate], '$.String')),
-    [r].[OptionalAssociate] = JSON_MODIFY([r].[OptionalAssociate], '$.String', @p)
-FROM [RootEntity] AS [r]
-WHERE [r].[OptionalAssociate] IS NOT NULL
-""");
-    }
-
-    #endregion Multiple updates
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionJetTest.cs
deleted file mode 100644
index dc743ef3..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionJetTest.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson;
-
-public class ComplexJsonCollectionJetTest(ComplexJsonJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : ComplexJsonCollectionRelationalTestBase<ComplexJsonJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Count()
-    {
-        await base.Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r].[AssociateCollection], '$') AS [a]) = 2
-""");
-    }
-
-    public override async Task Where()
-    {
-        await base.Where();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r].[AssociateCollection], '$') WITH ([Int] int '$.Int') AS [a]
-    WHERE [a].[Int] <> 8) = 2
-""");
-    }
-
-    public override async Task OrderBy_ElementAt()
-    {
-        await base.OrderBy_ElementAt();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT [a].[Int]
-    FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-        [Id] int '$.Id',
-        [Int] int '$.Int'
-    ) AS [a]
-    ORDER BY [a].[Id]
-    OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY) = 8
-""");
-    }
-
-    #region Distinct
-
-    public override async Task Distinct()
-    {
-        AssertSql(
-);
-    }
-
-    public override async Task Distinct_projected(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Distinct_projected(queryTrackingBehavior);
-
-        AssertSql();
-    }
-
-    public override async Task Distinct_over_projected_nested_collection()
-    {
-        AssertSql(
-);
-    }
-
-    public override async Task Distinct_over_projected_filtered_nested_collection()
-    {
-        await base.Distinct_over_projected_filtered_nested_collection();
-
-        AssertSql();
-    }
-
-    #endregion Distinct
-
-    #region Index
-
-    public override async Task Index_constant()
-    {
-        await base.Index_constant();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[AssociateCollection], '$[0].Int') AS int) = 8
-""");
-    }
-
-    public override async Task Index_parameter()
-    {
-        await base.Index_parameter();
-
-        AssertSql(
-                """
-@i='0'
-
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[AssociateCollection], '$[' + CAST(@i AS nvarchar(max)) + '].Int') AS int) = 8
-""");
-    }
-
-    public override async Task Index_column()
-    {
-        await base.Index_column();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[AssociateCollection], '$[' + CAST([r].[Id] - 1 AS nvarchar(max)) + '].Int') AS int) = 8
-""");
-    }
-
-    public override async Task Index_on_nested_collection()
-    {
-        await base.Index_on_nested_collection();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate], '$.NestedCollection[0].Int') AS int) = 8
-""");
-    }
-
-    public override async Task Index_out_of_bounds()
-    {
-        await base.Index_out_of_bounds();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[AssociateCollection], '$[9999].Int') AS int) = 8
-""");
-    }
-
-    #endregion Index
-
-    #region GroupBy
-
-    [ConditionalFact]
-    public override async Task GroupBy()
-    {
-        await base.GroupBy();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE 16 IN (
-    SELECT COALESCE(SUM([a].[Int]), 0)
-    FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-        [Int] int '$.Int',
-        [String] nvarchar(max) '$.String'
-    ) AS [a]
-    GROUP BY [a].[String]
-)
-""");
-    }
-
-    #endregion GroupBy
-
-    public override async Task Select_within_Select_within_Select_with_aggregates()
-    {
-        await base.Select_within_Select_within_Select_with_aggregates();
-
-        AssertSql(
-                """
-SELECT (
-    SELECT COALESCE(SUM([s].[value]), 0)
-    FROM OPENJSON([r].[AssociateCollection], '$') WITH ([NestedCollection] nvarchar(max) '$.NestedCollection' AS JSON) AS [a]
-    OUTER APPLY (
-        SELECT MAX([n].[Int]) AS [value]
-        FROM OPENJSON([a].[NestedCollection], '$') WITH ([Int] int '$.Int') AS [n]
-    ) AS [s])
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonJetFixture.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonJetFixture.cs
deleted file mode 100644
index 294fb54d..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonJetFixture.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson;
-
-public class ComplexJsonJetFixture : ComplexJsonRelationalFixtureBase
-{
-    protected override ITestStoreFactory TestStoreFactory
-        => JetTestStoreFactory.Instance;
-
-    public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-    {
-        var options = base.AddOptions(builder);
-        return options;
-    }
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousJetTest.cs
deleted file mode 100644
index 16a5b1e6..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousJetTest.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson;
-
-public class ComplexJsonMiscellaneousJetTest(ComplexJsonJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : ComplexJsonMiscellaneousRelationalTestBase<ComplexJsonJetFixture>(fixture, testOutputHelper)
-{
-    #region Simple filters
-
-    public override async Task Where_on_associate_scalar_property()
-    {
-        await base.Where_on_associate_scalar_property();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate], '$.Int') AS int) = 8
-""");
-    }
-
-    public override async Task Where_on_optional_associate_scalar_property()
-    {
-        await base.Where_on_optional_associate_scalar_property();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[OptionalAssociate], '$.Int') AS int) = 8
-""");
-    }
-
-    public override async Task Where_on_nested_associate_scalar_property()
-    {
-        await base.Where_on_nested_associate_scalar_property();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate], '$.RequiredNestedAssociate.Int') AS int) = 8
-""");
-    }
-
-    #endregion Simple filters
-
-    #region Value types
-
-    public override async Task Where_property_on_non_nullable_value_type()
-    {
-        await base.Where_property_on_non_nullable_value_type();
-
-        AssertSql(
-                """
-SELECT [v].[Id], [v].[Name], [v].[AssociateCollection], [v].[OptionalAssociate], [v].[RequiredAssociate]
-FROM [ValueRootEntity] AS [v]
-WHERE CAST(JSON_VALUE([v].[RequiredAssociate], '$.Int') AS int) = 8
-""");
-    }
-
-    public override async Task Where_property_on_nullable_value_type_Value()
-    {
-        await base.Where_property_on_nullable_value_type_Value();
-
-        AssertSql(
-                """
-SELECT [v].[Id], [v].[Name], [v].[AssociateCollection], [v].[OptionalAssociate], [v].[RequiredAssociate]
-FROM [ValueRootEntity] AS [v]
-WHERE CAST(JSON_VALUE([v].[OptionalAssociate], '$.Int') AS int) = 8
-""");
-    }
-
-    public override async Task Where_HasValue_on_nullable_value_type()
-    {
-        await base.Where_HasValue_on_nullable_value_type();
-
-        AssertSql(
-            """
-SELECT `v`.`Id`, `v`.`Name`, `v`.`AssociateCollection`, `v`.`OptionalAssociate`, `v`.`RequiredAssociate`
-FROM `ValueRootEntity` AS `v`
-WHERE (`v`.`OptionalAssociate`) IS NOT NULL
-""");
-    }
-
-    #endregion Value types
-
-    public override async Task FromSql_on_root()
-    {
-        await base.FromSql_on_root();
-
-        AssertSql(
-            """
-SELECT `m`.`Id`, `m`.`Name`, `m`.`AssociateCollection`, `m`.`OptionalAssociate`, `m`.`RequiredAssociate`
-FROM (
-    SELECT * FROM `RootEntity`
-) AS `m`
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonPrimitiveCollectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonPrimitiveCollectionJetTest.cs
deleted file mode 100644
index 553c00fd..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonPrimitiveCollectionJetTest.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson;
-
-public class ComplexJsonPrimitiveCollectionJetTest(ComplexJsonJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : ComplexJsonPrimitiveCollectionRelationalTestBase<ComplexJsonJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Count()
-    {
-        await base.Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) AS [i]) = 3
-""");
-    }
-
-    public override async Task Index()
-    {
-        await base.Index();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate], '$.Ints[0]') AS int) = 1
-""");
-    }
-
-    public override async Task Contains()
-    {
-        await base.Contains();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE 3 IN (
-    SELECT [i].[value]
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) WITH ([value] int '$') AS [i]
-)
-""");
-    }
-
-    public override async Task Any_predicate()
-    {
-        await base.Any_predicate();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE 2 IN (
-    SELECT [i].[value]
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) WITH ([value] int '$') AS [i]
-)
-""");
-    }
-
-    public override async Task Nested_Count()
-    {
-        await base.Nested_Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.RequiredNestedAssociate.Ints')) AS [i]) = 3
-""");
-    }
-
-    public override async Task Select_Sum()
-    {
-        await base.Select_Sum();
-
-        AssertSql(
-            """
-SELECT (
-    SELECT COALESCE(SUM([i0].[value]), 0)
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) WITH ([value] int '$') AS [i0])
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COALESCE(SUM([i].[value]), 0)
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) WITH ([value] int '$') AS [i]) >= 6
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionJetTest.cs
deleted file mode 100644
index b871b5ba..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionJetTest.cs
+++ /dev/null
@@ -1,375 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson;
-
-public class ComplexJsonProjectionJetTest(ComplexJsonJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : ComplexJsonProjectionRelationalTestBase<ComplexJsonJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Select_root(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_root(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-""");
-    }
-
-    #region Scalar properties
-
-    public override async Task Select_scalar_property_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_scalar_property_on_required_associate(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT JSON_VALUE([r].[RequiredAssociate], '$.String')
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Select_property_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_property_on_optional_associate(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT JSON_VALUE([r].[OptionalAssociate], '$.String')
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Select_value_type_property_on_null_associate_throws(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_value_type_property_on_null_associate_throws(queryTrackingBehavior);
-
-        AssertSql(
-);
-    }
-
-    public override async Task Select_nullable_value_type_property_on_null_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_nullable_value_type_property_on_null_associate(queryTrackingBehavior);
-
-        AssertSql(
-               """
-SELECT CAST(JSON_VALUE([r].[OptionalAssociate], '$.Int') AS int)
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    #endregion Scalar properties
-
-    #region Structural properties
-
-    public override async Task Select_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_associate(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-""");
-    }
-
-    public override async Task Select_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_optional_associate(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `r`.`OptionalAssociate`
-FROM `RootEntity` AS `r`
-""");
-    }
-
-    public override async Task Select_required_nested_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_required_nested_on_required_associate(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT JSON_QUERY([r].[RequiredAssociate], '$.RequiredNestedAssociate')
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Select_optional_nested_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_optional_nested_on_required_associate(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT JSON_QUERY([r].[RequiredAssociate], '$.OptionalNestedAssociate')
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Select_required_nested_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_required_nested_on_optional_associate(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT JSON_QUERY([r].[OptionalAssociate], '$.RequiredNestedAssociate')
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Select_optional_nested_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_optional_nested_on_optional_associate(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT JSON_QUERY([r].[OptionalAssociate], '$.OptionalNestedAssociate')
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Select_required_associate_via_optional_navigation(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_required_associate_via_optional_navigation(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `r0`.`RequiredAssociate`
-FROM `RootReferencingEntity` AS `r`
-LEFT JOIN `RootEntity` AS `r0` ON `r`.`RootEntityId` = `r0`.`Id`
-""");
-    }
-
-    public override async Task Select_unmapped_associate_scalar_property(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_unmapped_associate_scalar_property(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-""");
-    }
-
-    public override async Task Select_untranslatable_method_on_associate_scalar_property(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_untranslatable_method_on_associate_scalar_property(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT CAST(JSON_VALUE([r].[RequiredAssociate], '$.Int') AS int)
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    #endregion Structural properties
-
-    #region Structural collection properties
-
-    public override async Task Select_associate_collection(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_associate_collection(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `r`.`AssociateCollection`
-FROM `RootEntity` AS `r`
-ORDER BY `r`.`Id`
-""");
-    }
-
-    public override async Task Select_nested_collection_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_nested_collection_on_required_associate(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT JSON_QUERY([r].[RequiredAssociate], '$.NestedCollection')
-FROM [RootEntity] AS [r]
-ORDER BY [r].[Id]
-""");
-    }
-
-    public override async Task Select_nested_collection_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_nested_collection_on_optional_associate(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT JSON_QUERY([r].[OptionalAssociate], '$.NestedCollection')
-FROM [RootEntity] AS [r]
-ORDER BY [r].[Id]
-""");
-    }
-
-    public override async Task SelectMany_associate_collection(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.SelectMany_associate_collection(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT [a].[Id], [a].[Int], [a].[Ints], [a].[Name], [a].[String], [a].[NestedCollection], [a].[OptionalNestedAssociate], [a].[RequiredNestedAssociate]
-FROM [RootEntity] AS [r]
-CROSS APPLY OPENJSON([r].[AssociateCollection], '$') WITH (
-    [Id] int '$.Id',
-    [Int] int '$.Int',
-    [Ints] nvarchar(max) '$.Ints' AS JSON,
-    [Name] nvarchar(max) '$.Name',
-    [String] nvarchar(max) '$.String',
-    [NestedCollection] nvarchar(max) '$.NestedCollection' AS JSON,
-    [OptionalNestedAssociate] nvarchar(max) '$.OptionalNestedAssociate' AS JSON,
-    [RequiredNestedAssociate] nvarchar(max) '$.RequiredNestedAssociate' AS JSON
-) AS [a]
-""");
-    }
-
-    public override async Task SelectMany_nested_collection_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.SelectMany_nested_collection_on_required_associate(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT [n].[Id], [n].[Int], [n].[Ints], [n].[Name], [n].[String]
-FROM [RootEntity] AS [r]
-CROSS APPLY OPENJSON([r].[RequiredAssociate], '$.NestedCollection') WITH (
-    [Id] int '$.Id',
-    [Int] int '$.Int',
-    [Ints] nvarchar(max) '$.Ints' AS JSON,
-    [Name] nvarchar(max) '$.Name',
-    [String] nvarchar(max) '$.String'
-) AS [n]
-""");
-    }
-
-    public override async Task SelectMany_nested_collection_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.SelectMany_nested_collection_on_optional_associate(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT [n].[Id], [n].[Int], [n].[Ints], [n].[Name], [n].[String]
-FROM [RootEntity] AS [r]
-CROSS APPLY OPENJSON([r].[OptionalAssociate], '$.NestedCollection') WITH (
-    [Id] int '$.Id',
-    [Int] int '$.Int',
-    [Ints] nvarchar(max) '$.Ints' AS JSON,
-    [Name] nvarchar(max) '$.Name',
-    [String] nvarchar(max) '$.String'
-) AS [n]
-""");
-    }
-
-    #endregion Structural collection properties
-
-    #region Multiple
-
-    public override async Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_root_duplicated(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-""");
-    }
-
-    #endregion Multiple
-
-    #region Subquery
-
-    public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT [r1].[c]
-FROM [RootEntity] AS [r]
-OUTER APPLY (
-    SELECT TOP(1) JSON_QUERY([r0].[RequiredAssociate], '$.RequiredNestedAssociate') AS [c]
-    FROM [RootEntity] AS [r0]
-    ORDER BY [r0].[Id]
-) AS [r1]
-""");
-    }
-
-    public override async Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT [r1].[c]
-FROM [RootEntity] AS [r]
-OUTER APPLY (
-    SELECT TOP(1) JSON_QUERY([r0].[OptionalAssociate], '$.RequiredNestedAssociate') AS [c]
-    FROM [RootEntity] AS [r0]
-    ORDER BY [r0].[Id]
-) AS [r1]
-""");
-    }
-
-    #endregion Subquery
-
-    #region Value types
-
-    public override async Task Select_root_with_value_types(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_root_with_value_types(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `v`.`Id`, `v`.`Name`, `v`.`AssociateCollection`, `v`.`OptionalAssociate`, `v`.`RequiredAssociate`
-FROM `ValueRootEntity` AS `v`
-""");
-    }
-
-    public override async Task Select_non_nullable_value_type(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_non_nullable_value_type(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `v`.`RequiredAssociate`
-FROM `ValueRootEntity` AS `v`
-ORDER BY `v`.`Id`
-""");
-    }
-
-    public override async Task Select_nullable_value_type(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_nullable_value_type(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `v`.`OptionalAssociate`
-FROM `ValueRootEntity` AS `v`
-ORDER BY `v`.`Id`
-""");
-    }
-
-    public override async Task Select_nullable_value_type_with_Value(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_nullable_value_type_with_Value(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `v`.`OptionalAssociate`
-FROM `ValueRootEntity` AS `v`
-ORDER BY `v`.`Id`
-""");
-    }
-
-    #endregion Value types
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSetOperationsJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSetOperationsJetTest.cs
deleted file mode 100644
index df4241bf..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSetOperationsJetTest.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson;
-
-public class ComplexJsonSetOperationsJetTest(ComplexJsonJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : ComplexJsonSetOperationsRelationalTestBase<ComplexJsonJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Over_associate_collections()
-    {
-        await base.Over_associate_collections();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM (
-        SELECT 1 AS empty
-        FROM OPENJSON([r].[AssociateCollection], '$') WITH ([Int] int '$.Int') AS [a]
-        WHERE [a].[Int] = 8
-        UNION ALL
-        SELECT 1 AS empty
-        FROM OPENJSON([r].[AssociateCollection], '$') WITH ([String] nvarchar(max) '$.String') AS [a0]
-        WHERE [a0].[String] = N'foo'
-    ) AS [u]) = 4
-""");
-    }
-
-    public override async Task Over_associate_collection_projected(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Over_associate_collection_projected(queryTrackingBehavior);
-
-        AssertSql();
-    }
-
-    public override async Task Over_assocate_collection_Select_nested_with_aggregates_projected(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Over_assocate_collection_Select_nested_with_aggregates_projected(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT (
-    SELECT COALESCE(SUM([s].[value]), 0)
-    FROM (
-        SELECT [a].[NestedCollection] AS [NestedCollection]
-        FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-            [Int] int '$.Int',
-            [NestedCollection] nvarchar(max) '$.NestedCollection' AS JSON
-        ) AS [a]
-        WHERE [a].[Int] = 8
-        UNION ALL
-        SELECT [a0].[NestedCollection] AS [NestedCollection]
-        FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-            [String] nvarchar(max) '$.String',
-            [NestedCollection] nvarchar(max) '$.NestedCollection' AS JSON
-        ) AS [a0]
-        WHERE [a0].[String] = N'foo'
-    ) AS [u]
-    OUTER APPLY (
-        SELECT COALESCE(SUM([n].[Int]), 0) AS [value]
-        FROM OPENJSON([u].[NestedCollection], '$') WITH ([Int] int '$.Int') AS [n]
-    ) AS [s])
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Over_nested_associate_collection()
-    {
-        await base.Over_nested_associate_collection();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM (
-        SELECT 1 AS empty
-        FROM OPENJSON([r].[RequiredAssociate], '$.NestedCollection') WITH ([Int] int '$.Int') AS [n]
-        WHERE [n].[Int] = 8
-        UNION ALL
-        SELECT 1 AS empty
-        FROM OPENJSON([r].[RequiredAssociate], '$.NestedCollection') WITH ([String] nvarchar(max) '$.String') AS [n0]
-        WHERE [n0].[String] = N'foo'
-    ) AS [u]) = 4
-""");
-    }
-
-    public override async Task Over_different_collection_properties()
-    {
-        await base.Over_different_collection_properties();
-
-        AssertSql();
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityJetTest.cs
deleted file mode 100644
index 053a8fb2..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityJetTest.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexJson;
-
-public class ComplexJsonStructuralEqualityJetTest(ComplexJsonJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : ComplexJsonStructuralEqualityRelationalTestBase<ComplexJsonJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Two_associates()
-    {
-        await base.Two_associates();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE (`r`.`RequiredAssociate`) = (`r`.`OptionalAssociate`)
-""");
-    }
-
-    public override async Task Two_nested_associates()
-    {
-        await base.Two_nested_associates();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE JSON_QUERY([r].[RequiredAssociate], '$.RequiredNestedAssociate') = JSON_QUERY([r].[OptionalAssociate], '$.RequiredNestedAssociate')
-""");
-    }
-
-    public override async Task Not_equals()
-    {
-        await base.Not_equals();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE (`r`.`RequiredAssociate`) <> (`r`.`OptionalAssociate`) OR (`r`.`OptionalAssociate`) IS NULL
-""");
-    }
-
-    public override async Task Associate_with_inline_null()
-    {
-        await base.Associate_with_inline_null();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE (`r`.`OptionalAssociate`) IS NULL
-""");
-    }
-
-    public override async Task Associate_with_parameter_null()
-    {
-        await base.Associate_with_parameter_null();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE (`r`.`OptionalAssociate`) IS NULL
-""");
-    }
-
-    public override async Task Nested_associate_with_inline_null()
-    {
-        await base.Nested_associate_with_inline_null();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE JSON_QUERY([r].[RequiredAssociate], '$.OptionalNestedAssociate') IS NULL
-""");
-    }
-
-    public override async Task Nested_associate_with_inline()
-    {
-        await base.Nested_associate_with_inline();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE JSON_QUERY([r].[RequiredAssociate], '$.RequiredNestedAssociate') = '{"Id":1000,"Int":8,"Ints":[1,2,3],"Name":"Root1_RequiredAssociate_RequiredNestedAssociate","String":"foo"}'
-""");
-    }
-
-    public override async Task Nested_associate_with_parameter()
-    {
-        await base.Nested_associate_with_parameter();
-
-        AssertSql(
-                """
-@entity_equality_nested='{"Id":1000,"Int":8,"Ints":[1,2,3],"Name":"Root1_RequiredAssociate_RequiredNestedAssociate","String":"foo"}' (Size = 106)
-
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE JSON_QUERY([r].[RequiredAssociate], '$.RequiredNestedAssociate') = @entity_equality_nested
-""");
-    }
-
-    public override async Task Two_nested_collections()
-    {
-        await base.Two_nested_collections();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE JSON_QUERY([r].[RequiredAssociate], '$.NestedCollection') = JSON_QUERY([r].[OptionalAssociate], '$.NestedCollection')
-""");
-    }
-
-    public override async Task Nested_collection_with_inline()
-    {
-        await base.Nested_collection_with_inline();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE JSON_QUERY([r].[RequiredAssociate], '$.NestedCollection') = '[{"Id":1002,"Int":8,"Ints":[1,2,3],"Name":"Root1_RequiredAssociate_NestedCollection_1","String":"foo"},{"Id":1003,"Int":8,"Ints":[1,2,3],"Name":"Root1_RequiredAssociate_NestedCollection_2","String":"foo"}]'
-""");
-    }
-
-    public override async Task Nested_collection_with_parameter()
-    {
-        await base.Nested_collection_with_parameter();
-
-        AssertSql(
-                """
-@entity_equality_nestedCollection='[{"Id":1002,"Int":8,"Ints":[1,2,3],"Name":"Root1_RequiredAssociate_NestedCollection_1","String":"foo"},{"Id":1003,"Int":8,"Ints":[1,2,3],"Name":"Root1_RequiredAssociate_NestedCollection_2","String":"foo"}]' (Size = 205)
-
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE JSON_QUERY([r].[RequiredAssociate], '$.NestedCollection') = @entity_equality_nestedCollection
-""");
-    }
-
-    #region Contains
-
-    public override async Task Contains_with_inline()
-    {
-        await base.Contains_with_inline();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE EXISTS (
-    SELECT 1
-    FROM OPENJSON([r].[RequiredAssociate], '$.NestedCollection') WITH (
-        [Id] int '$.Id',
-        [Int] int '$.Int',
-        [Ints] nvarchar(max) '$.Ints' AS JSON,
-        [Name] nvarchar(max) '$.Name',
-        [String] nvarchar(max) '$.String'
-    ) AS [n]
-    WHERE [n].[Id] = 1002 AND [n].[Int] = 8 AND [n].[Ints] = N'[1,2,3]' AND [n].[Name] = N'Root1_RequiredAssociate_NestedCollection_1' AND [n].[String] = N'foo')
-""");
-    }
-
-    public override async Task Contains_with_parameter()
-    {
-        await base.Contains_with_parameter();
-
-        AssertSql(
-                """
-@entity_equality_nested_Id='1002' (Nullable = true)
-@entity_equality_nested_Int='8' (Nullable = true)
-@entity_equality_nested_Ints='[1,2,3]' (Size = 4000)
-@entity_equality_nested_Name='Root1_RequiredAssociate_NestedCollection_1' (Size = 4000)
-@entity_equality_nested_String='foo' (Size = 4000)
-
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE EXISTS (
-    SELECT 1
-    FROM OPENJSON([r].[RequiredAssociate], '$.NestedCollection') WITH (
-        [Id] int '$.Id',
-        [Int] int '$.Int',
-        [Ints] nvarchar(max) '$.Ints' AS JSON,
-        [Name] nvarchar(max) '$.Name',
-        [String] nvarchar(max) '$.String'
-    ) AS [n]
-    WHERE [n].[Id] = @entity_equality_nested_Id AND [n].[Int] = @entity_equality_nested_Int AND [n].[Ints] = @entity_equality_nested_Ints AND [n].[Name] = @entity_equality_nested_Name AND [n].[String] = @entity_equality_nested_String)
-""");
-    }
-
-    public override async Task Contains_with_operators_composed_on_the_collection()
-    {
-        await base.Contains_with_operators_composed_on_the_collection();
-
-        AssertSql(
-                """
-@get_Item_Int='106'
-@entity_equality_get_Item_Id='3003' (Nullable = true)
-@entity_equality_get_Item_Int='108' (Nullable = true)
-@entity_equality_get_Item_Ints='[8,9,109]' (Size = 4000)
-@entity_equality_get_Item_Name='Root3_RequiredAssociate_NestedCollection_2' (Size = 4000)
-@entity_equality_get_Item_String='foo104' (Size = 4000)
-
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE EXISTS (
-    SELECT 1
-    FROM OPENJSON([r].[RequiredAssociate], '$.NestedCollection') WITH (
-        [Id] int '$.Id',
-        [Int] int '$.Int',
-        [Ints] nvarchar(max) '$.Ints' AS JSON,
-        [Name] nvarchar(max) '$.Name',
-        [String] nvarchar(max) '$.String'
-    ) AS [n]
-    WHERE [n].[Int] > @get_Item_Int AND [n].[Id] = @entity_equality_get_Item_Id AND [n].[Int] = @entity_equality_get_Item_Int AND [n].[Ints] = @entity_equality_get_Item_Ints AND [n].[Name] = @entity_equality_get_Item_Name AND [n].[String] = @entity_equality_get_Item_String)
-""");
-    }
-
-    public override async Task Contains_with_nested_and_composed_operators()
-    {
-        await base.Contains_with_nested_and_composed_operators();
-
-        AssertSql(
-                """
-@get_Item_Id='302'
-@entity_equality_get_Item_Id='303' (Nullable = true)
-@entity_equality_get_Item_Int='130' (Nullable = true)
-@entity_equality_get_Item_Ints='[8,9,131]' (Size = 4000)
-@entity_equality_get_Item_Name='Root3_AssociateCollection_2' (Size = 4000)
-@entity_equality_get_Item_String='foo115' (Size = 4000)
-@entity_equality_get_Item_NestedCollection='[{"Id":3014,"Int":136,"Ints":[8,9,137],"Name":"Root3_AssociateCollection_2_NestedCollection_1","String":"foo118"},{"Id":3015,"Int":138,"Ints":[8,9,139],"Name":"Root3_Root1_AssociateCollection_2_NestedCollection_2","String":"foo119"}]' (Size = 233)
-@entity_equality_get_Item_OptionalNestedAssociate='{"Id":3013,"Int":134,"Ints":[8,9,135],"Name":"Root3_AssociateCollection_2_OptionalNestedAssociate","String":"foo117"}' (Size = 117)
-@entity_equality_get_Item_RequiredNestedAssociate='{"Id":3012,"Int":132,"Ints":[8,9,133],"Name":"Root3_AssociateCollection_2_RequiredNestedAssociate","String":"foo116"}' (Size = 117)
-
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE EXISTS (
-    SELECT 1
-    FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-        [Id] int '$.Id',
-        [Int] int '$.Int',
-        [Ints] nvarchar(max) '$.Ints' AS JSON,
-        [Name] nvarchar(max) '$.Name',
-        [String] nvarchar(max) '$.String',
-        [NestedCollection] nvarchar(max) '$.NestedCollection' AS JSON,
-        [OptionalNestedAssociate] nvarchar(max) '$.OptionalNestedAssociate' AS JSON,
-        [RequiredNestedAssociate] nvarchar(max) '$.RequiredNestedAssociate' AS JSON
-    ) AS [a]
-    WHERE [a].[Id] > @get_Item_Id AND [a].[Id] = @entity_equality_get_Item_Id AND [a].[Int] = @entity_equality_get_Item_Int AND [a].[Ints] = @entity_equality_get_Item_Ints AND [a].[Name] = @entity_equality_get_Item_Name AND [a].[String] = @entity_equality_get_Item_String AND [a].[NestedCollection] = @entity_equality_get_Item_NestedCollection AND [a].[OptionalNestedAssociate] = @entity_equality_get_Item_OptionalNestedAssociate AND [a].[RequiredNestedAssociate] = @entity_equality_get_Item_RequiredNestedAssociate)
-""");
-    }
-
-    #endregion Contains
-
-    #region Value types
-
-    public override async Task Nullable_value_type_with_null()
-    {
-        await base.Nullable_value_type_with_null();
-
-        AssertSql(
-            """
-SELECT `v`.`Id`, `v`.`Name`, `v`.`AssociateCollection`, `v`.`OptionalAssociate`, `v`.`RequiredAssociate`
-FROM `ValueRootEntity` AS `v`
-WHERE (`v`.`OptionalAssociate`) IS NULL
-""");
-    }
-
-    #endregion Value types
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingPrimitiveCollectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingPrimitiveCollectionJetTest.cs
deleted file mode 100644
index ee3356da..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingPrimitiveCollectionJetTest.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.ComplexTableSplitting;
-
-public class ComplexTableSplittingPrimitiveCollectionJetTest(
-    ComplexTableSplittingJetFixture fixture,
-    ITestOutputHelper testOutputHelper)
-    : ComplexTableSplittingPrimitiveCollectionRelationalTestBase<ComplexTableSplittingJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Count()
-    {
-        await base.Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) AS [r0]) = 3
-""");
-    }
-
-    public override async Task Index()
-    {
-        await base.Index();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate_Ints], '$[0]') AS int) = 1
-""");
-    }
-
-    public override async Task Contains()
-    {
-        await base.Contains();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-WHERE 3 IN (
-    SELECT [r0].[value]
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) WITH ([value] int '$') AS [r0]
-)
-""");
-    }
-
-    public override async Task Any_predicate()
-    {
-        await base.Any_predicate();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-WHERE 2 IN (
-    SELECT [r0].[value]
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) WITH ([value] int '$') AS [r0]
-)
-""");
-    }
-
-    public override async Task Nested_Count()
-    {
-        await base.Nested_Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r].[RequiredAssociate_RequiredNestedAssociate_Ints]) AS [r0]) = 3
-""");
-    }
-
-    public override async Task Select_Sum()
-    {
-        await base.Select_Sum();
-
-        AssertSql(
-            """
-SELECT (
-    SELECT COALESCE(SUM([r1].[value]), 0)
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) WITH ([value] int '$') AS [r1])
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COALESCE(SUM([r0].[value]), 0)
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) WITH ([value] int '$') AS [r0]) >= 6
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionJetTest.cs
index f958980d..fec1da44 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionJetTest.cs
@@ -257,6 +257,23 @@ public override async Task Select_root_duplicated(QueryTrackingBehavior queryTra
 
     #region Subquery
 
+    public override async Task Select_subquery_FirstOrDefault_complex_collection(QueryTrackingBehavior queryTrackingBehavior)
+    {
+        await base.Select_subquery_FirstOrDefault_complex_collection(queryTrackingBehavior);
+
+        AssertSql(
+            """
+SELECT [r1].[Id], [r1].[Name], [r1].[OptionalAssociate_Id], [r1].[OptionalAssociate_Int], [r1].[OptionalAssociate_Ints], [r1].[OptionalAssociate_Name], [r1].[OptionalAssociate_String], [r1].[OptionalAssociate_OptionalNestedAssociate_Id], [r1].[OptionalAssociate_OptionalNestedAssociate_Int], [r1].[OptionalAssociate_OptionalNestedAssociate_Ints], [r1].[OptionalAssociate_OptionalNestedAssociate_Name], [r1].[OptionalAssociate_OptionalNestedAssociate_String], [r1].[OptionalAssociate_RequiredNestedAssociate_Id], [r1].[OptionalAssociate_RequiredNestedAssociate_Int], [r1].[OptionalAssociate_RequiredNestedAssociate_Ints], [r1].[OptionalAssociate_RequiredNestedAssociate_Name], [r1].[OptionalAssociate_RequiredNestedAssociate_String], [r1].[RequiredAssociate_Id], [r1].[RequiredAssociate_Int], [r1].[RequiredAssociate_Ints], [r1].[RequiredAssociate_Name], [r1].[RequiredAssociate_String], [r1].[RequiredAssociate_OptionalNestedAssociate_Id], [r1].[RequiredAssociate_OptionalNestedAssociate_Int], [r1].[RequiredAssociate_OptionalNestedAssociate_Ints], [r1].[RequiredAssociate_OptionalNestedAssociate_Name], [r1].[RequiredAssociate_OptionalNestedAssociate_String], [r1].[RequiredAssociate_RequiredNestedAssociate_Id], [r1].[RequiredAssociate_RequiredNestedAssociate_Int], [r1].[RequiredAssociate_RequiredNestedAssociate_Ints], [r1].[RequiredAssociate_RequiredNestedAssociate_Name], [r1].[RequiredAssociate_RequiredNestedAssociate_String], [r1].[c]
+FROM [RootEntity] AS [r]
+OUTER APPLY (
+    SELECT TOP(1) [r0].[Id], [r0].[Name], [r0].[OptionalAssociate_Id], [r0].[OptionalAssociate_Int], [r0].[OptionalAssociate_Ints], [r0].[OptionalAssociate_Name], [r0].[OptionalAssociate_String], [r0].[OptionalAssociate_OptionalNestedAssociate_Id], [r0].[OptionalAssociate_OptionalNestedAssociate_Int], [r0].[OptionalAssociate_OptionalNestedAssociate_Ints], [r0].[OptionalAssociate_OptionalNestedAssociate_Name], [r0].[OptionalAssociate_OptionalNestedAssociate_String], [r0].[OptionalAssociate_RequiredNestedAssociate_Id], [r0].[OptionalAssociate_RequiredNestedAssociate_Int], [r0].[OptionalAssociate_RequiredNestedAssociate_Ints], [r0].[OptionalAssociate_RequiredNestedAssociate_Name], [r0].[OptionalAssociate_RequiredNestedAssociate_String], [r0].[RequiredAssociate_Id], [r0].[RequiredAssociate_Int], [r0].[RequiredAssociate_Ints], [r0].[RequiredAssociate_Name], [r0].[RequiredAssociate_String], [r0].[RequiredAssociate_OptionalNestedAssociate_Id], [r0].[RequiredAssociate_OptionalNestedAssociate_Int], [r0].[RequiredAssociate_OptionalNestedAssociate_Ints], [r0].[RequiredAssociate_OptionalNestedAssociate_Name], [r0].[RequiredAssociate_OptionalNestedAssociate_String], [r0].[RequiredAssociate_RequiredNestedAssociate_Id], [r0].[RequiredAssociate_RequiredNestedAssociate_Int], [r0].[RequiredAssociate_RequiredNestedAssociate_Ints], [r0].[RequiredAssociate_RequiredNestedAssociate_Name], [r0].[RequiredAssociate_RequiredNestedAssociate_String], 1 AS [c]
+    FROM [RootEntity] AS [r0]
+    ORDER BY [r0].[Id]
+) AS [r1]
+ORDER BY [r].[Id]
+""");
+    }
+
     public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
     {
         await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior);
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/Navigations/NavigationsPrimitiveCollectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/Navigations/NavigationsPrimitiveCollectionJetTest.cs
deleted file mode 100644
index cb88b54e..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/Navigations/NavigationsPrimitiveCollectionJetTest.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.Navigations;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.Navigations;
-
-public class NavigationsPrimitiveCollectionJetTest(NavigationsJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : NavigationsPrimitiveCollectionRelationalTestBase<NavigationsJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Count()
-    {
-        await base.Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociateId], [r].[RequiredAssociateId], [a].[Id], [a0].[Id], [n].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[CollectionRootId], [s].[Int], [s].[Ints], [s].[Name], [s].[OptionalNestedAssociateId], [s].[RequiredNestedAssociateId], [s].[String], [s].[Id0], [s].[Id1], [s].[Id2], [s].[CollectionAssociateId], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[CollectionAssociateId0], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[CollectionAssociateId1], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [a0].[CollectionRootId], [a0].[Int], [a0].[Ints], [a0].[Name], [a0].[OptionalNestedAssociateId], [a0].[RequiredNestedAssociateId], [a0].[String], [n6].[Id], [n6].[CollectionAssociateId], [n6].[Int], [n6].[Ints], [n6].[Name], [n6].[String], [n].[CollectionAssociateId], [n].[Int], [n].[Ints], [n].[Name], [n].[String], [n0].[CollectionAssociateId], [n0].[Int], [n0].[Ints], [n0].[Name], [n0].[String], [a].[CollectionRootId], [a].[Int], [a].[Ints], [a].[Name], [a].[OptionalNestedAssociateId], [a].[RequiredNestedAssociateId], [a].[String], [n7].[Id], [n7].[CollectionAssociateId], [n7].[Int], [n7].[Ints], [n7].[Name], [n7].[String], [n1].[CollectionAssociateId], [n1].[Int], [n1].[Ints], [n1].[Name], [n1].[String], [n2].[CollectionAssociateId], [n2].[Int], [n2].[Ints], [n2].[Name], [n2].[String]
-FROM [RootEntity] AS [r]
-INNER JOIN [AssociateType] AS [a] ON [r].[RequiredAssociateId] = [a].[Id]
-LEFT JOIN [AssociateType] AS [a0] ON [r].[OptionalAssociateId] = [a0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n] ON [a0].[OptionalNestedAssociateId] = [n].[Id]
-LEFT JOIN [NestedAssociateType] AS [n0] ON [a0].[RequiredNestedAssociateId] = [n0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n1] ON [a].[OptionalNestedAssociateId] = [n1].[Id]
-INNER JOIN [NestedAssociateType] AS [n2] ON [a].[RequiredNestedAssociateId] = [n2].[Id]
-LEFT JOIN (
-    SELECT [a1].[Id], [a1].[CollectionRootId], [a1].[Int], [a1].[Ints], [a1].[Name], [a1].[OptionalNestedAssociateId], [a1].[RequiredNestedAssociateId], [a1].[String], [n3].[Id] AS [Id0], [n4].[Id] AS [Id1], [n5].[Id] AS [Id2], [n5].[CollectionAssociateId], [n5].[Int] AS [Int0], [n5].[Ints] AS [Ints0], [n5].[Name] AS [Name0], [n5].[String] AS [String0], [n3].[CollectionAssociateId] AS [CollectionAssociateId0], [n3].[Int] AS [Int1], [n3].[Ints] AS [Ints1], [n3].[Name] AS [Name1], [n3].[String] AS [String1], [n4].[CollectionAssociateId] AS [CollectionAssociateId1], [n4].[Int] AS [Int2], [n4].[Ints] AS [Ints2], [n4].[Name] AS [Name2], [n4].[String] AS [String2]
-    FROM [AssociateType] AS [a1]
-    LEFT JOIN [NestedAssociateType] AS [n3] ON [a1].[OptionalNestedAssociateId] = [n3].[Id]
-    INNER JOIN [NestedAssociateType] AS [n4] ON [a1].[RequiredNestedAssociateId] = [n4].[Id]
-    LEFT JOIN [NestedAssociateType] AS [n5] ON [a1].[Id] = [n5].[CollectionAssociateId]
-) AS [s] ON [r].[Id] = [s].[CollectionRootId]
-LEFT JOIN [NestedAssociateType] AS [n6] ON [a0].[Id] = [n6].[CollectionAssociateId]
-LEFT JOIN [NestedAssociateType] AS [n7] ON [a].[Id] = [n7].[CollectionAssociateId]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([a].[Ints]) AS [i]) = 3
-ORDER BY [r].[Id], [a].[Id], [a0].[Id], [n].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[Id0], [s].[Id1], [s].[Id2], [n6].[Id]
-""");
-    }
-
-    public override async Task Index()
-    {
-        await base.Index();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociateId], [r].[RequiredAssociateId], [a].[Id], [a0].[Id], [n].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[CollectionRootId], [s].[Int], [s].[Ints], [s].[Name], [s].[OptionalNestedAssociateId], [s].[RequiredNestedAssociateId], [s].[String], [s].[Id0], [s].[Id1], [s].[Id2], [s].[CollectionAssociateId], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[CollectionAssociateId0], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[CollectionAssociateId1], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [a0].[CollectionRootId], [a0].[Int], [a0].[Ints], [a0].[Name], [a0].[OptionalNestedAssociateId], [a0].[RequiredNestedAssociateId], [a0].[String], [n6].[Id], [n6].[CollectionAssociateId], [n6].[Int], [n6].[Ints], [n6].[Name], [n6].[String], [n].[CollectionAssociateId], [n].[Int], [n].[Ints], [n].[Name], [n].[String], [n0].[CollectionAssociateId], [n0].[Int], [n0].[Ints], [n0].[Name], [n0].[String], [a].[CollectionRootId], [a].[Int], [a].[Ints], [a].[Name], [a].[OptionalNestedAssociateId], [a].[RequiredNestedAssociateId], [a].[String], [n7].[Id], [n7].[CollectionAssociateId], [n7].[Int], [n7].[Ints], [n7].[Name], [n7].[String], [n1].[CollectionAssociateId], [n1].[Int], [n1].[Ints], [n1].[Name], [n1].[String], [n2].[CollectionAssociateId], [n2].[Int], [n2].[Ints], [n2].[Name], [n2].[String]
-FROM [RootEntity] AS [r]
-INNER JOIN [AssociateType] AS [a] ON [r].[RequiredAssociateId] = [a].[Id]
-LEFT JOIN [AssociateType] AS [a0] ON [r].[OptionalAssociateId] = [a0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n] ON [a0].[OptionalNestedAssociateId] = [n].[Id]
-LEFT JOIN [NestedAssociateType] AS [n0] ON [a0].[RequiredNestedAssociateId] = [n0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n1] ON [a].[OptionalNestedAssociateId] = [n1].[Id]
-INNER JOIN [NestedAssociateType] AS [n2] ON [a].[RequiredNestedAssociateId] = [n2].[Id]
-LEFT JOIN (
-    SELECT [a1].[Id], [a1].[CollectionRootId], [a1].[Int], [a1].[Ints], [a1].[Name], [a1].[OptionalNestedAssociateId], [a1].[RequiredNestedAssociateId], [a1].[String], [n3].[Id] AS [Id0], [n4].[Id] AS [Id1], [n5].[Id] AS [Id2], [n5].[CollectionAssociateId], [n5].[Int] AS [Int0], [n5].[Ints] AS [Ints0], [n5].[Name] AS [Name0], [n5].[String] AS [String0], [n3].[CollectionAssociateId] AS [CollectionAssociateId0], [n3].[Int] AS [Int1], [n3].[Ints] AS [Ints1], [n3].[Name] AS [Name1], [n3].[String] AS [String1], [n4].[CollectionAssociateId] AS [CollectionAssociateId1], [n4].[Int] AS [Int2], [n4].[Ints] AS [Ints2], [n4].[Name] AS [Name2], [n4].[String] AS [String2]
-    FROM [AssociateType] AS [a1]
-    LEFT JOIN [NestedAssociateType] AS [n3] ON [a1].[OptionalNestedAssociateId] = [n3].[Id]
-    INNER JOIN [NestedAssociateType] AS [n4] ON [a1].[RequiredNestedAssociateId] = [n4].[Id]
-    LEFT JOIN [NestedAssociateType] AS [n5] ON [a1].[Id] = [n5].[CollectionAssociateId]
-) AS [s] ON [r].[Id] = [s].[CollectionRootId]
-LEFT JOIN [NestedAssociateType] AS [n6] ON [a0].[Id] = [n6].[CollectionAssociateId]
-LEFT JOIN [NestedAssociateType] AS [n7] ON [a].[Id] = [n7].[CollectionAssociateId]
-WHERE CAST(JSON_VALUE([a].[Ints], '$[0]') AS int) = 1
-ORDER BY [r].[Id], [a].[Id], [a0].[Id], [n].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[Id0], [s].[Id1], [s].[Id2], [n6].[Id]
-""");
-    }
-
-    public override async Task Contains()
-    {
-        await base.Contains();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociateId], [r].[RequiredAssociateId], [a].[Id], [a0].[Id], [n].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[CollectionRootId], [s].[Int], [s].[Ints], [s].[Name], [s].[OptionalNestedAssociateId], [s].[RequiredNestedAssociateId], [s].[String], [s].[Id0], [s].[Id1], [s].[Id2], [s].[CollectionAssociateId], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[CollectionAssociateId0], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[CollectionAssociateId1], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [a0].[CollectionRootId], [a0].[Int], [a0].[Ints], [a0].[Name], [a0].[OptionalNestedAssociateId], [a0].[RequiredNestedAssociateId], [a0].[String], [n6].[Id], [n6].[CollectionAssociateId], [n6].[Int], [n6].[Ints], [n6].[Name], [n6].[String], [n].[CollectionAssociateId], [n].[Int], [n].[Ints], [n].[Name], [n].[String], [n0].[CollectionAssociateId], [n0].[Int], [n0].[Ints], [n0].[Name], [n0].[String], [a].[CollectionRootId], [a].[Int], [a].[Ints], [a].[Name], [a].[OptionalNestedAssociateId], [a].[RequiredNestedAssociateId], [a].[String], [n7].[Id], [n7].[CollectionAssociateId], [n7].[Int], [n7].[Ints], [n7].[Name], [n7].[String], [n1].[CollectionAssociateId], [n1].[Int], [n1].[Ints], [n1].[Name], [n1].[String], [n2].[CollectionAssociateId], [n2].[Int], [n2].[Ints], [n2].[Name], [n2].[String]
-FROM [RootEntity] AS [r]
-INNER JOIN [AssociateType] AS [a] ON [r].[RequiredAssociateId] = [a].[Id]
-LEFT JOIN [AssociateType] AS [a0] ON [r].[OptionalAssociateId] = [a0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n] ON [a0].[OptionalNestedAssociateId] = [n].[Id]
-LEFT JOIN [NestedAssociateType] AS [n0] ON [a0].[RequiredNestedAssociateId] = [n0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n1] ON [a].[OptionalNestedAssociateId] = [n1].[Id]
-INNER JOIN [NestedAssociateType] AS [n2] ON [a].[RequiredNestedAssociateId] = [n2].[Id]
-LEFT JOIN (
-    SELECT [a1].[Id], [a1].[CollectionRootId], [a1].[Int], [a1].[Ints], [a1].[Name], [a1].[OptionalNestedAssociateId], [a1].[RequiredNestedAssociateId], [a1].[String], [n3].[Id] AS [Id0], [n4].[Id] AS [Id1], [n5].[Id] AS [Id2], [n5].[CollectionAssociateId], [n5].[Int] AS [Int0], [n5].[Ints] AS [Ints0], [n5].[Name] AS [Name0], [n5].[String] AS [String0], [n3].[CollectionAssociateId] AS [CollectionAssociateId0], [n3].[Int] AS [Int1], [n3].[Ints] AS [Ints1], [n3].[Name] AS [Name1], [n3].[String] AS [String1], [n4].[CollectionAssociateId] AS [CollectionAssociateId1], [n4].[Int] AS [Int2], [n4].[Ints] AS [Ints2], [n4].[Name] AS [Name2], [n4].[String] AS [String2]
-    FROM [AssociateType] AS [a1]
-    LEFT JOIN [NestedAssociateType] AS [n3] ON [a1].[OptionalNestedAssociateId] = [n3].[Id]
-    INNER JOIN [NestedAssociateType] AS [n4] ON [a1].[RequiredNestedAssociateId] = [n4].[Id]
-    LEFT JOIN [NestedAssociateType] AS [n5] ON [a1].[Id] = [n5].[CollectionAssociateId]
-) AS [s] ON [r].[Id] = [s].[CollectionRootId]
-LEFT JOIN [NestedAssociateType] AS [n6] ON [a0].[Id] = [n6].[CollectionAssociateId]
-LEFT JOIN [NestedAssociateType] AS [n7] ON [a].[Id] = [n7].[CollectionAssociateId]
-WHERE 3 IN (
-    SELECT [i].[value]
-    FROM OPENJSON([a].[Ints]) WITH ([value] int '$') AS [i]
-)
-ORDER BY [r].[Id], [a].[Id], [a0].[Id], [n].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[Id0], [s].[Id1], [s].[Id2], [n6].[Id]
-""");
-    }
-
-    public override async Task Any_predicate()
-    {
-        await base.Any_predicate();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociateId], [r].[RequiredAssociateId], [a].[Id], [a0].[Id], [n].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[CollectionRootId], [s].[Int], [s].[Ints], [s].[Name], [s].[OptionalNestedAssociateId], [s].[RequiredNestedAssociateId], [s].[String], [s].[Id0], [s].[Id1], [s].[Id2], [s].[CollectionAssociateId], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[CollectionAssociateId0], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[CollectionAssociateId1], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [a0].[CollectionRootId], [a0].[Int], [a0].[Ints], [a0].[Name], [a0].[OptionalNestedAssociateId], [a0].[RequiredNestedAssociateId], [a0].[String], [n6].[Id], [n6].[CollectionAssociateId], [n6].[Int], [n6].[Ints], [n6].[Name], [n6].[String], [n].[CollectionAssociateId], [n].[Int], [n].[Ints], [n].[Name], [n].[String], [n0].[CollectionAssociateId], [n0].[Int], [n0].[Ints], [n0].[Name], [n0].[String], [a].[CollectionRootId], [a].[Int], [a].[Ints], [a].[Name], [a].[OptionalNestedAssociateId], [a].[RequiredNestedAssociateId], [a].[String], [n7].[Id], [n7].[CollectionAssociateId], [n7].[Int], [n7].[Ints], [n7].[Name], [n7].[String], [n1].[CollectionAssociateId], [n1].[Int], [n1].[Ints], [n1].[Name], [n1].[String], [n2].[CollectionAssociateId], [n2].[Int], [n2].[Ints], [n2].[Name], [n2].[String]
-FROM [RootEntity] AS [r]
-INNER JOIN [AssociateType] AS [a] ON [r].[RequiredAssociateId] = [a].[Id]
-LEFT JOIN [AssociateType] AS [a0] ON [r].[OptionalAssociateId] = [a0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n] ON [a0].[OptionalNestedAssociateId] = [n].[Id]
-LEFT JOIN [NestedAssociateType] AS [n0] ON [a0].[RequiredNestedAssociateId] = [n0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n1] ON [a].[OptionalNestedAssociateId] = [n1].[Id]
-INNER JOIN [NestedAssociateType] AS [n2] ON [a].[RequiredNestedAssociateId] = [n2].[Id]
-LEFT JOIN (
-    SELECT [a1].[Id], [a1].[CollectionRootId], [a1].[Int], [a1].[Ints], [a1].[Name], [a1].[OptionalNestedAssociateId], [a1].[RequiredNestedAssociateId], [a1].[String], [n3].[Id] AS [Id0], [n4].[Id] AS [Id1], [n5].[Id] AS [Id2], [n5].[CollectionAssociateId], [n5].[Int] AS [Int0], [n5].[Ints] AS [Ints0], [n5].[Name] AS [Name0], [n5].[String] AS [String0], [n3].[CollectionAssociateId] AS [CollectionAssociateId0], [n3].[Int] AS [Int1], [n3].[Ints] AS [Ints1], [n3].[Name] AS [Name1], [n3].[String] AS [String1], [n4].[CollectionAssociateId] AS [CollectionAssociateId1], [n4].[Int] AS [Int2], [n4].[Ints] AS [Ints2], [n4].[Name] AS [Name2], [n4].[String] AS [String2]
-    FROM [AssociateType] AS [a1]
-    LEFT JOIN [NestedAssociateType] AS [n3] ON [a1].[OptionalNestedAssociateId] = [n3].[Id]
-    INNER JOIN [NestedAssociateType] AS [n4] ON [a1].[RequiredNestedAssociateId] = [n4].[Id]
-    LEFT JOIN [NestedAssociateType] AS [n5] ON [a1].[Id] = [n5].[CollectionAssociateId]
-) AS [s] ON [r].[Id] = [s].[CollectionRootId]
-LEFT JOIN [NestedAssociateType] AS [n6] ON [a0].[Id] = [n6].[CollectionAssociateId]
-LEFT JOIN [NestedAssociateType] AS [n7] ON [a].[Id] = [n7].[CollectionAssociateId]
-WHERE 2 IN (
-    SELECT [i].[value]
-    FROM OPENJSON([a].[Ints]) WITH ([value] int '$') AS [i]
-)
-ORDER BY [r].[Id], [a].[Id], [a0].[Id], [n].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[Id0], [s].[Id1], [s].[Id2], [n6].[Id]
-""");
-    }
-
-    public override async Task Nested_Count()
-    {
-        await base.Nested_Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[OptionalAssociateId], [r].[RequiredAssociateId], [a].[Id], [n].[Id], [a0].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[CollectionRootId], [s].[Int], [s].[Ints], [s].[Name], [s].[OptionalNestedAssociateId], [s].[RequiredNestedAssociateId], [s].[String], [s].[Id0], [s].[Id1], [s].[Id2], [s].[CollectionAssociateId], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[CollectionAssociateId0], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[CollectionAssociateId1], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [a0].[CollectionRootId], [a0].[Int], [a0].[Ints], [a0].[Name], [a0].[OptionalNestedAssociateId], [a0].[RequiredNestedAssociateId], [a0].[String], [n6].[Id], [n6].[CollectionAssociateId], [n6].[Int], [n6].[Ints], [n6].[Name], [n6].[String], [n0].[CollectionAssociateId], [n0].[Int], [n0].[Ints], [n0].[Name], [n0].[String], [n1].[CollectionAssociateId], [n1].[Int], [n1].[Ints], [n1].[Name], [n1].[String], [a].[CollectionRootId], [a].[Int], [a].[Ints], [a].[Name], [a].[OptionalNestedAssociateId], [a].[RequiredNestedAssociateId], [a].[String], [n7].[Id], [n7].[CollectionAssociateId], [n7].[Int], [n7].[Ints], [n7].[Name], [n7].[String], [n2].[CollectionAssociateId], [n2].[Int], [n2].[Ints], [n2].[Name], [n2].[String], [n].[CollectionAssociateId], [n].[Int], [n].[Ints], [n].[Name], [n].[String]
-FROM [RootEntity] AS [r]
-INNER JOIN [AssociateType] AS [a] ON [r].[RequiredAssociateId] = [a].[Id]
-INNER JOIN [NestedAssociateType] AS [n] ON [a].[RequiredNestedAssociateId] = [n].[Id]
-LEFT JOIN [AssociateType] AS [a0] ON [r].[OptionalAssociateId] = [a0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n0] ON [a0].[OptionalNestedAssociateId] = [n0].[Id]
-LEFT JOIN [NestedAssociateType] AS [n1] ON [a0].[RequiredNestedAssociateId] = [n1].[Id]
-LEFT JOIN [NestedAssociateType] AS [n2] ON [a].[OptionalNestedAssociateId] = [n2].[Id]
-LEFT JOIN (
-    SELECT [a1].[Id], [a1].[CollectionRootId], [a1].[Int], [a1].[Ints], [a1].[Name], [a1].[OptionalNestedAssociateId], [a1].[RequiredNestedAssociateId], [a1].[String], [n3].[Id] AS [Id0], [n4].[Id] AS [Id1], [n5].[Id] AS [Id2], [n5].[CollectionAssociateId], [n5].[Int] AS [Int0], [n5].[Ints] AS [Ints0], [n5].[Name] AS [Name0], [n5].[String] AS [String0], [n3].[CollectionAssociateId] AS [CollectionAssociateId0], [n3].[Int] AS [Int1], [n3].[Ints] AS [Ints1], [n3].[Name] AS [Name1], [n3].[String] AS [String1], [n4].[CollectionAssociateId] AS [CollectionAssociateId1], [n4].[Int] AS [Int2], [n4].[Ints] AS [Ints2], [n4].[Name] AS [Name2], [n4].[String] AS [String2]
-    FROM [AssociateType] AS [a1]
-    LEFT JOIN [NestedAssociateType] AS [n3] ON [a1].[OptionalNestedAssociateId] = [n3].[Id]
-    INNER JOIN [NestedAssociateType] AS [n4] ON [a1].[RequiredNestedAssociateId] = [n4].[Id]
-    LEFT JOIN [NestedAssociateType] AS [n5] ON [a1].[Id] = [n5].[CollectionAssociateId]
-) AS [s] ON [r].[Id] = [s].[CollectionRootId]
-LEFT JOIN [NestedAssociateType] AS [n6] ON [a0].[Id] = [n6].[CollectionAssociateId]
-LEFT JOIN [NestedAssociateType] AS [n7] ON [a].[Id] = [n7].[CollectionAssociateId]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([n].[Ints]) AS [i]) = 3
-ORDER BY [r].[Id], [a].[Id], [n].[Id], [a0].[Id], [n0].[Id], [n1].[Id], [n2].[Id], [s].[Id], [s].[Id0], [s].[Id1], [s].[Id2], [n6].[Id]
-""");
-    }
-
-    public override async Task Select_Sum()
-    {
-        await base.Select_Sum();
-
-        AssertSql(
-            """
-SELECT (
-    SELECT COALESCE(SUM([i0].[value]), 0)
-    FROM OPENJSON([a].[Ints]) WITH ([value] int '$') AS [i0])
-FROM [RootEntity] AS [r]
-INNER JOIN [AssociateType] AS [a] ON [r].[RequiredAssociateId] = [a].[Id]
-WHERE (
-    SELECT COALESCE(SUM([i].[value]), 0)
-    FROM OPENJSON([a].[Ints]) WITH ([value] int '$') AS [i]) >= 6
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionJetTest.cs
index f79cbed0..96fa114f 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionJetTest.cs
@@ -365,6 +365,30 @@ LEFT JOIN (
 
     #region Subquery
 
+    public override async Task Select_subquery_FirstOrDefault_complex_collection(QueryTrackingBehavior queryTrackingBehavior)
+    {
+        await base.Select_subquery_FirstOrDefault_complex_collection(queryTrackingBehavior);
+
+        AssertSql(
+            """
+SELECT [r].[Id], [r1].[Id], [s].[Id], [s].[CollectionRootId], [s].[Int], [s].[Ints], [s].[Name], [s].[OptionalNestedAssociateId], [s].[RequiredNestedAssociateId], [s].[String], [s].[Id0], [s].[Id1], [s].[Id2], [s].[CollectionAssociateId], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[CollectionAssociateId0], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[CollectionAssociateId1], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [r1].[c]
+FROM [RootEntity] AS [r]
+OUTER APPLY (
+    SELECT TOP(1) 1 AS [c], [r0].[Id]
+    FROM [RootEntity] AS [r0]
+    ORDER BY [r0].[Id]
+) AS [r1]
+LEFT JOIN (
+    SELECT [a].[Id], [a].[CollectionRootId], [a].[Int], [a].[Ints], [a].[Name], [a].[OptionalNestedAssociateId], [a].[RequiredNestedAssociateId], [a].[String], [n].[Id] AS [Id0], [n0].[Id] AS [Id1], [n1].[Id] AS [Id2], [n1].[CollectionAssociateId], [n1].[Int] AS [Int0], [n1].[Ints] AS [Ints0], [n1].[Name] AS [Name0], [n1].[String] AS [String0], [n].[CollectionAssociateId] AS [CollectionAssociateId0], [n].[Int] AS [Int1], [n].[Ints] AS [Ints1], [n].[Name] AS [Name1], [n].[String] AS [String1], [n0].[CollectionAssociateId] AS [CollectionAssociateId1], [n0].[Int] AS [Int2], [n0].[Ints] AS [Ints2], [n0].[Name] AS [Name2], [n0].[String] AS [String2]
+    FROM [AssociateType] AS [a]
+    LEFT JOIN [NestedAssociateType] AS [n] ON [a].[OptionalNestedAssociateId] = [n].[Id]
+    INNER JOIN [NestedAssociateType] AS [n0] ON [a].[RequiredNestedAssociateId] = [n0].[Id]
+    LEFT JOIN [NestedAssociateType] AS [n1] ON [a].[Id] = [n1].[CollectionAssociateId]
+) AS [s] ON [r1].[Id] = [s].[CollectionRootId]
+ORDER BY [r].[Id], [r1].[Id], [s].[Id], [s].[Id0], [s].[Id1]
+""");
+    }
+
     public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
     {
         await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior);
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonBulkUpdateJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonBulkUpdateJetTest.cs
deleted file mode 100644
index 9848b7ec..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonBulkUpdateJetTest.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson;
-
-public class OwnedJsonBulkUpdateJetTest(
-    OwnedJsonJetFixture fixture,
-    ITestOutputHelper testOutputHelper)
-    : OwnedJsonBulkUpdateRelationalTestBase<OwnedJsonJetFixture>(fixture, testOutputHelper);
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionJetTest.cs
deleted file mode 100644
index 16208a52..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionJetTest.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson;
-
-public class OwnedJsonCollectionJetTest(OwnedJsonJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : OwnedJsonCollectionRelationalTestBase<OwnedJsonJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Count()
-    {
-        await base.Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r].[AssociateCollection], '$') AS [a]) = 2
-""");
-    }
-
-    public override async Task Where()
-    {
-        await base.Where();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-        [Id] int '$.Id',
-        [Int] int '$.Int',
-        [Ints] nvarchar(max) '$.Ints' AS JSON,
-        [Name] nvarchar(max) '$.Name',
-        [String] nvarchar(max) '$.String'
-    ) AS [a]
-    WHERE [a].[Int] <> 8) = 2
-""");
-    }
-
-    public override async Task OrderBy_ElementAt()
-    {
-        await base.OrderBy_ElementAt();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT [a].[Int]
-    FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-        [Id] int '$.Id',
-        [Int] int '$.Int',
-        [Ints] nvarchar(max) '$.Ints' AS JSON,
-        [Name] nvarchar(max) '$.Name',
-        [String] nvarchar(max) '$.String'
-    ) AS [a]
-    ORDER BY [a].[Id]
-    OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY) = 8
-""");
-    }
-
-    #region Distinct
-
-    public override async Task Distinct()
-    {
-        await base.Distinct();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM (
-        SELECT DISTINCT [r].[Id], [a].[Id] AS [Id0], [a].[Int], [a].[Ints], [a].[Name], [a].[String], [a].[NestedCollection] AS [c], [a].[OptionalNestedAssociate] AS [c0], [a].[RequiredNestedAssociate] AS [c1]
-        FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-            [Id] int '$.Id',
-            [Int] int '$.Int',
-            [Ints] nvarchar(max) '$.Ints' AS JSON,
-            [Name] nvarchar(max) '$.Name',
-            [String] nvarchar(max) '$.String',
-            [NestedCollection] nvarchar(max) '$.NestedCollection' AS JSON,
-            [OptionalNestedAssociate] nvarchar(max) '$.OptionalNestedAssociate' AS JSON,
-            [RequiredNestedAssociate] nvarchar(max) '$.RequiredNestedAssociate' AS JSON
-        ) AS [a]
-    ) AS [a0]) = 2
-""");
-    }
-
-    public override async Task Distinct_projected(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        if (queryTrackingBehavior is QueryTrackingBehavior.TrackAll)
-        {
-            await base.Distinct_projected(queryTrackingBehavior);
-        }
-        else
-        {
-            await base.Distinct_projected(queryTrackingBehavior);
-
-            AssertSql(
-                """
-SELECT [r].[Id], [a0].[Id], [a0].[Id0], [a0].[Int], [a0].[Ints], [a0].[Name], [a0].[String], [a0].[c], [a0].[c0], [a0].[c1]
-FROM [RootEntity] AS [r]
-OUTER APPLY (
-    SELECT DISTINCT [r].[Id], [a].[Id] AS [Id0], [a].[Int], [a].[Ints], [a].[Name], [a].[String], [a].[NestedCollection] AS [c], [a].[OptionalNestedAssociate] AS [c0], [a].[RequiredNestedAssociate] AS [c1]
-    FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-        [Id] int '$.Id',
-        [Int] int '$.Int',
-        [Ints] nvarchar(max) '$.Ints' AS JSON,
-        [Name] nvarchar(max) '$.Name',
-        [String] nvarchar(max) '$.String',
-        [NestedCollection] nvarchar(max) '$.NestedCollection' AS JSON,
-        [OptionalNestedAssociate] nvarchar(max) '$.OptionalNestedAssociate' AS JSON,
-        [RequiredNestedAssociate] nvarchar(max) '$.RequiredNestedAssociate' AS JSON
-    ) AS [a]
-) AS [a0]
-ORDER BY [r].[Id], [a0].[Id0], [a0].[Int], [a0].[Ints], [a0].[Name]
-""");
-        }
-    }
-
-    public override async Task Distinct_over_projected_nested_collection()
-    {
-        await base.Distinct_over_projected_nested_collection();
-
-        AssertSql();
-    }
-
-    public override async Task Distinct_over_projected_filtered_nested_collection()
-    {
-        await base.Distinct_over_projected_filtered_nested_collection();
-
-        AssertSql();
-    }
-
-    #endregion Distinct
-
-    #region Index
-
-    public override async Task Index_constant()
-    {
-        await base.Index_constant();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[AssociateCollection], '$[0].Int') AS int) = 8
-""");
-    }
-
-
-    public override async Task Index_parameter()
-    {
-        await base.Index_parameter();
-
-        AssertSql(
-                """
-@i='0'
-
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[AssociateCollection], '$[' + CAST(@i AS nvarchar(max)) + '].Int') AS int) = 8
-""");
-    }
-
-    public override async Task Index_column()
-    {
-        await base.Index_column();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[AssociateCollection], '$[' + CAST([r].[Id] - 1 AS nvarchar(max)) + '].Int') AS int) = 8
-""");
-    }
-
-    public override async Task Index_on_nested_collection()
-    {
-        await base.Index_on_nested_collection();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate], '$.NestedCollection[0].Int') AS int) = 8
-""");
-    }
-
-    public override async Task Index_out_of_bounds()
-    {
-        await base.Index_out_of_bounds();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[AssociateCollection], '$[9999].Int') AS int) = 8
-""");
-    }
-
-    #endregion Index
-
-    #region GroupBy
-
-    [ConditionalFact]
-    public override async Task GroupBy()
-    {
-        await base.GroupBy();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE 16 IN (
-    SELECT COALESCE(SUM([a0].[Int]), 0)
-    FROM (
-        SELECT [a].[Id] AS [Id0], [a].[Int], [a].[Ints], [a].[Name], [a].[String], [a].[String] AS [Key0]
-        FROM OPENJSON([r].[AssociateCollection], '$') WITH (
-            [Id] int '$.Id',
-            [Int] int '$.Int',
-            [Ints] nvarchar(max) '$.Ints' AS JSON,
-            [Name] nvarchar(max) '$.Name',
-            [String] nvarchar(max) '$.String'
-        ) AS [a]
-    ) AS [a0]
-    GROUP BY [a0].[Key0]
-)
-""");
-    }
-
-    #endregion GroupBy
-
-    public override async Task Select_within_Select_within_Select_with_aggregates()
-    {
-        await base.Select_within_Select_within_Select_with_aggregates();
-
-        AssertSql(
-                """
-SELECT (
-    SELECT COALESCE(SUM([s].[value]), 0)
-    FROM OPENJSON([r].[AssociateCollection], '$') WITH ([NestedCollection] nvarchar(max) '$.NestedCollection' AS JSON) AS [a]
-    OUTER APPLY (
-        SELECT MAX([n].[Int]) AS [value]
-        FROM OPENJSON([a].[NestedCollection], '$') WITH (
-            [Id] int '$.Id',
-            [Int] int '$.Int',
-            [Ints] nvarchar(max) '$.Ints' AS JSON,
-            [Name] nvarchar(max) '$.Name',
-            [String] nvarchar(max) '$.String'
-        ) AS [n]
-    ) AS [s])
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonJetFixture.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonJetFixture.cs
deleted file mode 100644
index 1fe7c50f..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonJetFixture.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson;
-
-public class OwnedJsonJetFixture : OwnedJsonRelationalFixtureBase
-{
-    protected override ITestStoreFactory TestStoreFactory
-        => JetTestStoreFactory.Instance;
-
-    public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-    {
-        var options = base.AddOptions(builder);
-        return options;
-    }
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousJetTest.cs
deleted file mode 100644
index eca2c336..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousJetTest.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson;
-
-public class OwnedJsonMiscellaneousJetTest(
-    OwnedJsonJetFixture fixture,
-    ITestOutputHelper testOutputHelper)
-    : OwnedJsonMiscellaneousRelationalTestBase<OwnedJsonJetFixture>(fixture, testOutputHelper)
-{
-    #region Simple filters
-
-    public override async Task Where_on_associate_scalar_property()
-    {
-        await base.Where_on_associate_scalar_property();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate], '$.Int') AS int) = 8
-""");
-    }
-
-    public override async Task Where_on_optional_associate_scalar_property()
-    {
-        await base.Where_on_optional_associate_scalar_property();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[OptionalAssociate], '$.Int') AS int) = 8
-""");
-    }
-
-    public override async Task Where_on_nested_associate_scalar_property()
-    {
-        await base.Where_on_nested_associate_scalar_property();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate], '$.RequiredNestedAssociate.Int') AS int) = 8
-""");
-    }
-
-    #endregion Simple filters
-
-    public override async Task FromSql_on_root()
-    {
-        await base.FromSql_on_root();
-
-        AssertSql(
-            """
-SELECT `m`.`Id`, `m`.`Name`, `m`.`AssociateCollection`, `m`.`OptionalAssociate`, `m`.`RequiredAssociate`
-FROM (
-    SELECT * FROM `RootEntity`
-) AS `m`
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonPrimitiveCollectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonPrimitiveCollectionJetTest.cs
deleted file mode 100644
index b9500483..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonPrimitiveCollectionJetTest.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson;
-
-public class OwnedJsonPrimitiveCollectionJetTest(OwnedJsonJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : OwnedJsonPrimitiveCollectionRelationalTestBase<OwnedJsonJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Count()
-    {
-        await base.Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) AS [i]) = 3
-""");
-    }
-
-    public override async Task Index()
-    {
-        await base.Index();
-
-        AssertSql(
-                """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate], '$.Ints[0]') AS int) = 1
-""");
-    }
-
-    public override async Task Contains()
-    {
-        await base.Contains();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE 3 IN (
-    SELECT [i].[value]
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) WITH ([value] int '$') AS [i]
-)
-""");
-    }
-
-    public override async Task Any_predicate()
-    {
-        await base.Any_predicate();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE 2 IN (
-    SELECT [i].[value]
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) WITH ([value] int '$') AS [i]
-)
-""");
-    }
-
-    public override async Task Nested_Count()
-    {
-        await base.Nested_Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.RequiredNestedAssociate.Ints')) AS [i]) = 3
-""");
-    }
-
-    public override async Task Select_Sum()
-    {
-        await base.Select_Sum();
-
-        AssertSql(
-            """
-SELECT (
-    SELECT COALESCE(SUM([i0].[value]), 0)
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) WITH ([value] int '$') AS [i0])
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COALESCE(SUM([i].[value]), 0)
-    FROM OPENJSON(JSON_QUERY([r].[RequiredAssociate], '$.Ints')) WITH ([value] int '$') AS [i]) >= 6
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionJetTest.cs
deleted file mode 100644
index 73ac404b..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionJetTest.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson;
-
-public class OwnedJsonProjectionJetTest(OwnedJsonJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : OwnedJsonProjectionRelationalTestBase<OwnedJsonJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Select_root(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_root(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-""");
-    }
-
-    #region Scalar properties
-
-    public override async Task Select_scalar_property_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_scalar_property_on_required_associate(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT JSON_VALUE([r].[RequiredAssociate], '$.String')
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Select_property_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_property_on_optional_associate(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT JSON_VALUE([r].[OptionalAssociate], '$.String')
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    public override async Task Select_value_type_property_on_null_associate_throws(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_value_type_property_on_null_associate_throws(queryTrackingBehavior);
-
-        AssertSql(
-);
-    }
-
-    public override async Task Select_nullable_value_type_property_on_null_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_nullable_value_type_property_on_null_associate(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT CAST(JSON_VALUE([r].[OptionalAssociate], '$.Int') AS int)
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    #endregion Scalar properties
-
-    #region Structural properties
-
-    public override async Task Select_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT `r`.`RequiredAssociate`, `r`.`Id`
-FROM `RootEntity` AS `r`
-""");
-        }
-    }
-
-    public override async Task Select_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_optional_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT `r`.`OptionalAssociate`, `r`.`Id`
-FROM `RootEntity` AS `r`
-""");
-        }
-    }
-
-    public override async Task Select_required_nested_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_required_nested_on_required_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT JSON_QUERY([r].[RequiredAssociate], '$.RequiredNestedAssociate'), [r].[Id]
-FROM [RootEntity] AS [r]
-""");
-        }
-    }
-
-    public override async Task Select_optional_nested_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_optional_nested_on_required_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT JSON_QUERY([r].[RequiredAssociate], '$.OptionalNestedAssociate'), [r].[Id]
-FROM [RootEntity] AS [r]
-""");
-        }
-    }
-
-    public override async Task Select_required_nested_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_required_nested_on_optional_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT JSON_QUERY([r].[OptionalAssociate], '$.RequiredNestedAssociate'), [r].[Id]
-FROM [RootEntity] AS [r]
-""");
-        }
-    }
-
-    public override async Task Select_optional_nested_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_optional_nested_on_optional_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT JSON_QUERY([r].[OptionalAssociate], '$.OptionalNestedAssociate'), [r].[Id]
-FROM [RootEntity] AS [r]
-""");
-        }
-    }
-
-    public override async Task Select_required_associate_via_optional_navigation(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_required_associate_via_optional_navigation(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT `r0`.`RequiredAssociate`, `r0`.`Id`
-FROM `RootReferencingEntity` AS `r`
-LEFT JOIN `RootEntity` AS `r0` ON `r`.`RootEntityId` = `r0`.`Id`
-""");
-        }
-    }
-
-    public override async Task Select_unmapped_associate_scalar_property(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_unmapped_associate_scalar_property(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT `r`.`RequiredAssociate`, `r`.`Id`
-FROM `RootEntity` AS `r`
-""");
-        }
-    }
-
-    public override async Task Select_untranslatable_method_on_associate_scalar_property(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_untranslatable_method_on_associate_scalar_property(queryTrackingBehavior);
-
-        AssertSql(
-                """
-SELECT CAST(JSON_VALUE([r].[RequiredAssociate], '$.Int') AS int)
-FROM [RootEntity] AS [r]
-""");
-    }
-
-    #endregion Structural properties
-
-    #region Structural collection properties
-
-    public override async Task Select_associate_collection(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_associate_collection(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT `r`.`AssociateCollection`, `r`.`Id`
-FROM `RootEntity` AS `r`
-ORDER BY `r`.`Id`
-""");
-        }
-    }
-
-    public override async Task Select_nested_collection_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_nested_collection_on_required_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT JSON_QUERY([r].[RequiredAssociate], '$.NestedCollection'), [r].[Id]
-FROM [RootEntity] AS [r]
-ORDER BY [r].[Id]
-""");
-        }
-    }
-
-    public override async Task Select_nested_collection_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_nested_collection_on_optional_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT JSON_QUERY([r].[OptionalAssociate], '$.NestedCollection'), [r].[Id]
-FROM [RootEntity] AS [r]
-ORDER BY [r].[Id]
-""");
-        }
-    }
-
-    public override async Task SelectMany_associate_collection(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.SelectMany_associate_collection(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                    """
-SELECT [r].[Id], [a].[Id], [a].[Int], [a].[Ints], [a].[Name], [a].[String], [a].[NestedCollection], [a].[OptionalNestedAssociate], [a].[RequiredNestedAssociate]
-FROM [RootEntity] AS [r]
-CROSS APPLY OPENJSON([r].[AssociateCollection], '$') WITH (
-    [Id] int '$.Id',
-    [Int] int '$.Int',
-    [Ints] nvarchar(max) '$.Ints' AS JSON,
-    [Name] nvarchar(max) '$.Name',
-    [String] nvarchar(max) '$.String',
-    [NestedCollection] nvarchar(max) '$.NestedCollection' AS JSON,
-    [OptionalNestedAssociate] nvarchar(max) '$.OptionalNestedAssociate' AS JSON,
-    [RequiredNestedAssociate] nvarchar(max) '$.RequiredNestedAssociate' AS JSON
-) AS [a]
-""");
-        }
-    }
-
-    public override async Task SelectMany_nested_collection_on_required_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.SelectMany_nested_collection_on_required_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                    """
-SELECT [r].[Id], [n].[Id], [n].[Int], [n].[Ints], [n].[Name], [n].[String]
-FROM [RootEntity] AS [r]
-CROSS APPLY OPENJSON([r].[RequiredAssociate], '$.NestedCollection') WITH (
-    [Id] int '$.Id',
-    [Int] int '$.Int',
-    [Ints] nvarchar(max) '$.Ints' AS JSON,
-    [Name] nvarchar(max) '$.Name',
-    [String] nvarchar(max) '$.String'
-) AS [n]
-""");
-        }
-    }
-
-    public override async Task SelectMany_nested_collection_on_optional_associate(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.SelectMany_nested_collection_on_optional_associate(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                    """
-SELECT [r].[Id], [n].[Id], [n].[Int], [n].[Ints], [n].[Name], [n].[String]
-FROM [RootEntity] AS [r]
-CROSS APPLY OPENJSON([r].[OptionalAssociate], '$.NestedCollection') WITH (
-    [Id] int '$.Id',
-    [Int] int '$.Int',
-    [Ints] nvarchar(max) '$.Ints' AS JSON,
-    [Name] nvarchar(max) '$.Name',
-    [String] nvarchar(max) '$.String'
-) AS [n]
-""");
-        }
-    }
-
-    #endregion Structural collection properties
-
-    #region Multiple
-
-    public override async Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_root_duplicated(queryTrackingBehavior);
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-""");
-    }
-
-    #endregion Multiple
-
-    #region Subquery
-
-    public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT [r1].[c], [r1].[Id]
-FROM [RootEntity] AS [r]
-OUTER APPLY (
-    SELECT TOP(1) JSON_QUERY([r0].[RequiredAssociate], '$.RequiredNestedAssociate') AS [c], [r0].[Id]
-    FROM [RootEntity] AS [r0]
-    ORDER BY [r0].[Id]
-) AS [r1]
-""");
-        }
-    }
-
-    public override async Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
-    {
-        await base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior);
-
-        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
-        {
-            AssertSql(
-                """
-SELECT [r1].[c], [r1].[Id]
-FROM [RootEntity] AS [r]
-OUTER APPLY (
-    SELECT TOP(1) JSON_QUERY([r0].[OptionalAssociate], '$.RequiredNestedAssociate') AS [c], [r0].[Id]
-    FROM [RootEntity] AS [r0]
-    ORDER BY [r0].[Id]
-) AS [r1]
-""");
-        }
-    }
-
-    #endregion Subquery
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualityJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualityJetTest.cs
deleted file mode 100644
index 56a32f30..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualityJetTest.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson;
-
-public class OwnedJsonStructuralEqualityJetTest(
-    OwnedJsonJetFixture fixture,
-    ITestOutputHelper testOutputHelper)
-    : OwnedJsonStructuralEqualityRelationalTestBase<OwnedJsonJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Two_associates()
-    {
-        await base.Two_associates();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE FALSE
-""");
-    }
-
-    public override async Task Two_nested_associates()
-    {
-        await base.Two_nested_associates();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE FALSE
-""");
-    }
-
-    public override async Task Not_equals()
-    {
-        await base.Not_equals();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE FALSE
-""");
-    }
-
-    public override async Task Associate_with_inline_null()
-    {
-        await base.Associate_with_inline_null();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE (`r`.`OptionalAssociate`) IS NULL
-""");
-    }
-
-    public override async Task Associate_with_parameter_null()
-    {
-        await base.Associate_with_parameter_null();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE FALSE
-""");
-    }
-
-    public override async Task Nested_associate_with_inline_null()
-    {
-        await base.Nested_associate_with_inline_null();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r].[AssociateCollection], [r].[OptionalAssociate], [r].[RequiredAssociate]
-FROM [RootEntity] AS [r]
-WHERE JSON_QUERY([r].[RequiredAssociate], '$.OptionalNestedAssociate') IS NULL
-""");
-    }
-
-    public override async Task Nested_associate_with_inline()
-    {
-        await base.Nested_associate_with_inline();
-
-        AssertSql(
-        );
-    }
-
-    public override async Task Nested_associate_with_parameter()
-    {
-        await base.Nested_associate_with_parameter();
-
-        AssertSql(
-        );
-    }
-
-    public override async Task Two_nested_collections()
-    {
-        await base.Two_nested_collections();
-
-        AssertSql(
-            """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`AssociateCollection`, `r`.`OptionalAssociate`, `r`.`RequiredAssociate`
-FROM `RootEntity` AS `r`
-WHERE FALSE
-""");
-    }
-
-    public override async Task Nested_collection_with_inline()
-    {
-        await base.Nested_collection_with_inline();
-
-        AssertSql(
-        );
-    }
-
-    public override async Task Nested_collection_with_parameter()
-    {
-        await base.Nested_collection_with_parameter();
-
-        AssertSql(
-        );
-    }
-
-    #region Contains
-
-    public override async Task Contains_with_inline()
-    {
-        await base.Contains_with_inline();
-
-        AssertSql();
-    }
-
-    public override async Task Contains_with_parameter()
-    {
-        await base.Contains_with_parameter();
-
-        AssertSql();
-    }
-
-    public override async Task Contains_with_operators_composed_on_the_collection()
-    {
-        await base.Contains_with_operators_composed_on_the_collection();
-
-        AssertSql();
-    }
-
-    public override async Task Contains_with_nested_and_composed_operators()
-    {
-        await base.Contains_with_nested_and_composed_operators();
-
-        AssertSql();
-    }
-
-    #endregion Contains
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonTypeJetFixture.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonTypeJetFixture.cs
deleted file mode 100644
index b43758dd..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonTypeJetFixture.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedJson;
-
-public class OwnedJsonTypeJetFixture : OwnedJsonRelationalFixtureBase
-{
-    protected override string StoreName
-        => "OwnedJsonTypeRelationshipsQueryTest";
-
-    protected override ITestStoreFactory TestStoreFactory
-        => JetTestStoreFactory.Instance;
-
-    // protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
-    // {
-    //     base.OnModelCreating(modelBuilder, context);
-
-    //     modelBuilder.Entity<RootEntity>().OwnsOne(x => x.RequiredTrunk).HasColumnType("json");
-    //     modelBuilder.Entity<RootEntity>().OwnsOne(x => x.OptionalTrunk).HasColumnType("json");
-    //     modelBuilder.Entity<RootEntity>().OwnsMany(x => x.CollectionTrunk).HasColumnType("json");
-    // }
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsPrimitiveCollectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsPrimitiveCollectionJetTest.cs
deleted file mode 100644
index 650032a9..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsPrimitiveCollectionJetTest.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedNavigations;
-
-public class OwnedNavigationsPrimitiveCollectionJetTest(OwnedNavigationsJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : OwnedNavigationsPrimitiveCollectionRelationalTestBase<OwnedNavigationsJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Count()
-    {
-        await base.Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r0].[RootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[Id1], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[Id2], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [o2].[AssociateTypeRootEntityId], [o2].[Id], [o2].[Int], [o2].[Ints], [o2].[Name], [o2].[String], [o0].[Id], [o0].[Int], [o0].[Ints], [o0].[Name], [o0].[String], [o1].[Id], [o1].[Int], [o1].[Ints], [o1].[Name], [o1].[String], [r0].[Id], [r0].[Int], [r0].[Ints], [r0].[Name], [r0].[String], [r7].[AssociateTypeRootEntityId], [r7].[Id], [r7].[Int], [r7].[Ints], [r7].[Name], [r7].[String], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[Id], [r2].[Int], [r2].[Ints], [r2].[Name], [r2].[String]
-FROM [RootEntity] AS [r]
-LEFT JOIN [RequiredRelated] AS [r0] ON [r].[Id] = [r0].[RootEntityId]
-LEFT JOIN [OptionalRelated] AS [o] ON [r].[Id] = [o].[RootEntityId]
-LEFT JOIN [OptionalRelated_OptionalNested] AS [o0] ON [o].[RootEntityId] = [o0].[AssociateTypeRootEntityId]
-LEFT JOIN [OptionalRelated_RequiredNested] AS [o1] ON [o].[RootEntityId] = [o1].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_OptionalNested] AS [r1] ON [r0].[RootEntityId] = [r1].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_RequiredNested] AS [r2] ON [r0].[RootEntityId] = [r2].[AssociateTypeRootEntityId]
-LEFT JOIN (
-    SELECT [r3].[RootEntityId], [r3].[Id], [r3].[Int], [r3].[Ints], [r3].[Name], [r3].[String], [r4].[AssociateTypeRootEntityId], [r4].[AssociateTypeId], [r5].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId0], [r5].[AssociateTypeId] AS [AssociateTypeId0], [r6].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId1], [r6].[AssociateTypeId] AS [AssociateTypeId1], [r6].[Id] AS [Id0], [r6].[Int] AS [Int0], [r6].[Ints] AS [Ints0], [r6].[Name] AS [Name0], [r6].[String] AS [String0], [r4].[Id] AS [Id1], [r4].[Int] AS [Int1], [r4].[Ints] AS [Ints1], [r4].[Name] AS [Name1], [r4].[String] AS [String1], [r5].[Id] AS [Id2], [r5].[Int] AS [Int2], [r5].[Ints] AS [Ints2], [r5].[Name] AS [Name2], [r5].[String] AS [String2]
-    FROM [RelatedCollection] AS [r3]
-    LEFT JOIN [RelatedCollection_OptionalNested] AS [r4] ON [r3].[RootEntityId] = [r4].[AssociateTypeRootEntityId] AND [r3].[Id] = [r4].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_RequiredNested] AS [r5] ON [r3].[RootEntityId] = [r5].[AssociateTypeRootEntityId] AND [r3].[Id] = [r5].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r6] ON [r3].[RootEntityId] = [r6].[AssociateTypeRootEntityId] AND [r3].[Id] = [r6].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o2] ON [o].[RootEntityId] = [o2].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r7] ON [r0].[RootEntityId] = [r7].[AssociateTypeRootEntityId]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r0].[Ints]) AS [i]) = 3
-ORDER BY [r].[Id], [r0].[RootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [o2].[AssociateTypeRootEntityId], [o2].[Id], [r7].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Index()
-    {
-        await base.Index();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r0].[RootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[Id1], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[Id2], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [o2].[AssociateTypeRootEntityId], [o2].[Id], [o2].[Int], [o2].[Ints], [o2].[Name], [o2].[String], [o0].[Id], [o0].[Int], [o0].[Ints], [o0].[Name], [o0].[String], [o1].[Id], [o1].[Int], [o1].[Ints], [o1].[Name], [o1].[String], [r0].[Id], [r0].[Int], [r0].[Ints], [r0].[Name], [r0].[String], [r7].[AssociateTypeRootEntityId], [r7].[Id], [r7].[Int], [r7].[Ints], [r7].[Name], [r7].[String], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[Id], [r2].[Int], [r2].[Ints], [r2].[Name], [r2].[String]
-FROM [RootEntity] AS [r]
-LEFT JOIN [RequiredRelated] AS [r0] ON [r].[Id] = [r0].[RootEntityId]
-LEFT JOIN [OptionalRelated] AS [o] ON [r].[Id] = [o].[RootEntityId]
-LEFT JOIN [OptionalRelated_OptionalNested] AS [o0] ON [o].[RootEntityId] = [o0].[AssociateTypeRootEntityId]
-LEFT JOIN [OptionalRelated_RequiredNested] AS [o1] ON [o].[RootEntityId] = [o1].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_OptionalNested] AS [r1] ON [r0].[RootEntityId] = [r1].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_RequiredNested] AS [r2] ON [r0].[RootEntityId] = [r2].[AssociateTypeRootEntityId]
-LEFT JOIN (
-    SELECT [r3].[RootEntityId], [r3].[Id], [r3].[Int], [r3].[Ints], [r3].[Name], [r3].[String], [r4].[AssociateTypeRootEntityId], [r4].[AssociateTypeId], [r5].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId0], [r5].[AssociateTypeId] AS [AssociateTypeId0], [r6].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId1], [r6].[AssociateTypeId] AS [AssociateTypeId1], [r6].[Id] AS [Id0], [r6].[Int] AS [Int0], [r6].[Ints] AS [Ints0], [r6].[Name] AS [Name0], [r6].[String] AS [String0], [r4].[Id] AS [Id1], [r4].[Int] AS [Int1], [r4].[Ints] AS [Ints1], [r4].[Name] AS [Name1], [r4].[String] AS [String1], [r5].[Id] AS [Id2], [r5].[Int] AS [Int2], [r5].[Ints] AS [Ints2], [r5].[Name] AS [Name2], [r5].[String] AS [String2]
-    FROM [RelatedCollection] AS [r3]
-    LEFT JOIN [RelatedCollection_OptionalNested] AS [r4] ON [r3].[RootEntityId] = [r4].[AssociateTypeRootEntityId] AND [r3].[Id] = [r4].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_RequiredNested] AS [r5] ON [r3].[RootEntityId] = [r5].[AssociateTypeRootEntityId] AND [r3].[Id] = [r5].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r6] ON [r3].[RootEntityId] = [r6].[AssociateTypeRootEntityId] AND [r3].[Id] = [r6].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o2] ON [o].[RootEntityId] = [o2].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r7] ON [r0].[RootEntityId] = [r7].[AssociateTypeRootEntityId]
-WHERE CAST(JSON_VALUE([r0].[Ints], '$[0]') AS int) = 1
-ORDER BY [r].[Id], [r0].[RootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [o2].[AssociateTypeRootEntityId], [o2].[Id], [r7].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Contains()
-    {
-        await base.Contains();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r0].[RootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[Id1], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[Id2], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [o2].[AssociateTypeRootEntityId], [o2].[Id], [o2].[Int], [o2].[Ints], [o2].[Name], [o2].[String], [o0].[Id], [o0].[Int], [o0].[Ints], [o0].[Name], [o0].[String], [o1].[Id], [o1].[Int], [o1].[Ints], [o1].[Name], [o1].[String], [r0].[Id], [r0].[Int], [r0].[Ints], [r0].[Name], [r0].[String], [r7].[AssociateTypeRootEntityId], [r7].[Id], [r7].[Int], [r7].[Ints], [r7].[Name], [r7].[String], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[Id], [r2].[Int], [r2].[Ints], [r2].[Name], [r2].[String]
-FROM [RootEntity] AS [r]
-LEFT JOIN [RequiredRelated] AS [r0] ON [r].[Id] = [r0].[RootEntityId]
-LEFT JOIN [OptionalRelated] AS [o] ON [r].[Id] = [o].[RootEntityId]
-LEFT JOIN [OptionalRelated_OptionalNested] AS [o0] ON [o].[RootEntityId] = [o0].[AssociateTypeRootEntityId]
-LEFT JOIN [OptionalRelated_RequiredNested] AS [o1] ON [o].[RootEntityId] = [o1].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_OptionalNested] AS [r1] ON [r0].[RootEntityId] = [r1].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_RequiredNested] AS [r2] ON [r0].[RootEntityId] = [r2].[AssociateTypeRootEntityId]
-LEFT JOIN (
-    SELECT [r3].[RootEntityId], [r3].[Id], [r3].[Int], [r3].[Ints], [r3].[Name], [r3].[String], [r4].[AssociateTypeRootEntityId], [r4].[AssociateTypeId], [r5].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId0], [r5].[AssociateTypeId] AS [AssociateTypeId0], [r6].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId1], [r6].[AssociateTypeId] AS [AssociateTypeId1], [r6].[Id] AS [Id0], [r6].[Int] AS [Int0], [r6].[Ints] AS [Ints0], [r6].[Name] AS [Name0], [r6].[String] AS [String0], [r4].[Id] AS [Id1], [r4].[Int] AS [Int1], [r4].[Ints] AS [Ints1], [r4].[Name] AS [Name1], [r4].[String] AS [String1], [r5].[Id] AS [Id2], [r5].[Int] AS [Int2], [r5].[Ints] AS [Ints2], [r5].[Name] AS [Name2], [r5].[String] AS [String2]
-    FROM [RelatedCollection] AS [r3]
-    LEFT JOIN [RelatedCollection_OptionalNested] AS [r4] ON [r3].[RootEntityId] = [r4].[AssociateTypeRootEntityId] AND [r3].[Id] = [r4].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_RequiredNested] AS [r5] ON [r3].[RootEntityId] = [r5].[AssociateTypeRootEntityId] AND [r3].[Id] = [r5].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r6] ON [r3].[RootEntityId] = [r6].[AssociateTypeRootEntityId] AND [r3].[Id] = [r6].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o2] ON [o].[RootEntityId] = [o2].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r7] ON [r0].[RootEntityId] = [r7].[AssociateTypeRootEntityId]
-WHERE 3 IN (
-    SELECT [i].[value]
-    FROM OPENJSON([r0].[Ints]) WITH ([value] int '$') AS [i]
-)
-ORDER BY [r].[Id], [r0].[RootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [o2].[AssociateTypeRootEntityId], [o2].[Id], [r7].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Any_predicate()
-    {
-        await base.Any_predicate();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r0].[RootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[Id1], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[Id2], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [o2].[AssociateTypeRootEntityId], [o2].[Id], [o2].[Int], [o2].[Ints], [o2].[Name], [o2].[String], [o0].[Id], [o0].[Int], [o0].[Ints], [o0].[Name], [o0].[String], [o1].[Id], [o1].[Int], [o1].[Ints], [o1].[Name], [o1].[String], [r0].[Id], [r0].[Int], [r0].[Ints], [r0].[Name], [r0].[String], [r7].[AssociateTypeRootEntityId], [r7].[Id], [r7].[Int], [r7].[Ints], [r7].[Name], [r7].[String], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[Id], [r2].[Int], [r2].[Ints], [r2].[Name], [r2].[String]
-FROM [RootEntity] AS [r]
-LEFT JOIN [RequiredRelated] AS [r0] ON [r].[Id] = [r0].[RootEntityId]
-LEFT JOIN [OptionalRelated] AS [o] ON [r].[Id] = [o].[RootEntityId]
-LEFT JOIN [OptionalRelated_OptionalNested] AS [o0] ON [o].[RootEntityId] = [o0].[AssociateTypeRootEntityId]
-LEFT JOIN [OptionalRelated_RequiredNested] AS [o1] ON [o].[RootEntityId] = [o1].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_OptionalNested] AS [r1] ON [r0].[RootEntityId] = [r1].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_RequiredNested] AS [r2] ON [r0].[RootEntityId] = [r2].[AssociateTypeRootEntityId]
-LEFT JOIN (
-    SELECT [r3].[RootEntityId], [r3].[Id], [r3].[Int], [r3].[Ints], [r3].[Name], [r3].[String], [r4].[AssociateTypeRootEntityId], [r4].[AssociateTypeId], [r5].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId0], [r5].[AssociateTypeId] AS [AssociateTypeId0], [r6].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId1], [r6].[AssociateTypeId] AS [AssociateTypeId1], [r6].[Id] AS [Id0], [r6].[Int] AS [Int0], [r6].[Ints] AS [Ints0], [r6].[Name] AS [Name0], [r6].[String] AS [String0], [r4].[Id] AS [Id1], [r4].[Int] AS [Int1], [r4].[Ints] AS [Ints1], [r4].[Name] AS [Name1], [r4].[String] AS [String1], [r5].[Id] AS [Id2], [r5].[Int] AS [Int2], [r5].[Ints] AS [Ints2], [r5].[Name] AS [Name2], [r5].[String] AS [String2]
-    FROM [RelatedCollection] AS [r3]
-    LEFT JOIN [RelatedCollection_OptionalNested] AS [r4] ON [r3].[RootEntityId] = [r4].[AssociateTypeRootEntityId] AND [r3].[Id] = [r4].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_RequiredNested] AS [r5] ON [r3].[RootEntityId] = [r5].[AssociateTypeRootEntityId] AND [r3].[Id] = [r5].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r6] ON [r3].[RootEntityId] = [r6].[AssociateTypeRootEntityId] AND [r3].[Id] = [r6].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o2] ON [o].[RootEntityId] = [o2].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r7] ON [r0].[RootEntityId] = [r7].[AssociateTypeRootEntityId]
-WHERE 2 IN (
-    SELECT [i].[value]
-    FROM OPENJSON([r0].[Ints]) WITH ([value] int '$') AS [i]
-)
-ORDER BY [r].[Id], [r0].[RootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [o2].[AssociateTypeRootEntityId], [o2].[Id], [r7].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Nested_Count()
-    {
-        await base.Nested_Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [r0].[RootEntityId], [r1].[AssociateTypeRootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[Id1], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[Id2], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [o2].[AssociateTypeRootEntityId], [o2].[Id], [o2].[Int], [o2].[Ints], [o2].[Name], [o2].[String], [o0].[Id], [o0].[Int], [o0].[Ints], [o0].[Name], [o0].[String], [o1].[Id], [o1].[Int], [o1].[Ints], [o1].[Name], [o1].[String], [r0].[Id], [r0].[Int], [r0].[Ints], [r0].[Name], [r0].[String], [r7].[AssociateTypeRootEntityId], [r7].[Id], [r7].[Int], [r7].[Ints], [r7].[Name], [r7].[String], [r2].[Id], [r2].[Int], [r2].[Ints], [r2].[Name], [r2].[String], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String]
-FROM [RootEntity] AS [r]
-LEFT JOIN [RequiredRelated] AS [r0] ON [r].[Id] = [r0].[RootEntityId]
-LEFT JOIN [RequiredRelated_RequiredNested] AS [r1] ON [r0].[RootEntityId] = [r1].[AssociateTypeRootEntityId]
-LEFT JOIN [OptionalRelated] AS [o] ON [r].[Id] = [o].[RootEntityId]
-LEFT JOIN [OptionalRelated_OptionalNested] AS [o0] ON [o].[RootEntityId] = [o0].[AssociateTypeRootEntityId]
-LEFT JOIN [OptionalRelated_RequiredNested] AS [o1] ON [o].[RootEntityId] = [o1].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_OptionalNested] AS [r2] ON [r0].[RootEntityId] = [r2].[AssociateTypeRootEntityId]
-LEFT JOIN (
-    SELECT [r3].[RootEntityId], [r3].[Id], [r3].[Int], [r3].[Ints], [r3].[Name], [r3].[String], [r4].[AssociateTypeRootEntityId], [r4].[AssociateTypeId], [r5].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId0], [r5].[AssociateTypeId] AS [AssociateTypeId0], [r6].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId1], [r6].[AssociateTypeId] AS [AssociateTypeId1], [r6].[Id] AS [Id0], [r6].[Int] AS [Int0], [r6].[Ints] AS [Ints0], [r6].[Name] AS [Name0], [r6].[String] AS [String0], [r4].[Id] AS [Id1], [r4].[Int] AS [Int1], [r4].[Ints] AS [Ints1], [r4].[Name] AS [Name1], [r4].[String] AS [String1], [r5].[Id] AS [Id2], [r5].[Int] AS [Int2], [r5].[Ints] AS [Ints2], [r5].[Name] AS [Name2], [r5].[String] AS [String2]
-    FROM [RelatedCollection] AS [r3]
-    LEFT JOIN [RelatedCollection_OptionalNested] AS [r4] ON [r3].[RootEntityId] = [r4].[AssociateTypeRootEntityId] AND [r3].[Id] = [r4].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_RequiredNested] AS [r5] ON [r3].[RootEntityId] = [r5].[AssociateTypeRootEntityId] AND [r3].[Id] = [r5].[AssociateTypeId]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r6] ON [r3].[RootEntityId] = [r6].[AssociateTypeRootEntityId] AND [r3].[Id] = [r6].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o2] ON [o].[RootEntityId] = [o2].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r7] ON [r0].[RootEntityId] = [r7].[AssociateTypeRootEntityId]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r1].[Ints]) AS [i]) = 3
-ORDER BY [r].[Id], [r0].[RootEntityId], [r1].[AssociateTypeRootEntityId], [o].[RootEntityId], [o0].[AssociateTypeRootEntityId], [o1].[AssociateTypeRootEntityId], [r2].[AssociateTypeRootEntityId], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [o2].[AssociateTypeRootEntityId], [o2].[Id], [r7].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Select_Sum()
-    {
-        await base.Select_Sum();
-
-        AssertSql(
-            """
-SELECT (
-    SELECT COALESCE(SUM([i0].[value]), 0)
-    FROM OPENJSON([r0].[Ints]) WITH ([value] int '$') AS [i0])
-FROM [RootEntity] AS [r]
-LEFT JOIN [RequiredRelated] AS [r0] ON [r].[Id] = [r0].[RootEntityId]
-WHERE (
-    SELECT COALESCE(SUM([i].[value]), 0)
-    FROM OPENJSON([r0].[Ints]) WITH ([value] int '$') AS [i]) >= 6
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionJetTest.cs
index 5be4a352..9d9a8062 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionJetTest.cs
@@ -401,6 +401,33 @@ LEFT JOIN (
 
     #region Subquery
 
+    public override async Task Select_subquery_FirstOrDefault_complex_collection(QueryTrackingBehavior queryTrackingBehavior)
+    {
+        await base.Select_subquery_FirstOrDefault_complex_collection(queryTrackingBehavior);
+
+        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
+        {
+            AssertSql(
+                """
+SELECT [r].[Id], [r5].[Id], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[Id1], [s].[Int1], [s].[Ints1], [s].[Name1], [s].[String1], [s].[Id2], [s].[Int2], [s].[Ints2], [s].[Name2], [s].[String2], [r5].[c]
+FROM [RootEntity] AS [r]
+OUTER APPLY (
+    SELECT TOP(1) 1 AS [c], [r0].[Id]
+    FROM [RootEntity] AS [r0]
+    ORDER BY [r0].[Id]
+) AS [r5]
+LEFT JOIN (
+    SELECT [r1].[RootEntityId], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[AssociateTypeRootEntityId], [r2].[AssociateTypeId], [r3].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId0], [r3].[AssociateTypeId] AS [AssociateTypeId0], [r4].[AssociateTypeRootEntityId] AS [AssociateTypeRootEntityId1], [r4].[AssociateTypeId] AS [AssociateTypeId1], [r4].[Id] AS [Id0], [r4].[Int] AS [Int0], [r4].[Ints] AS [Ints0], [r4].[Name] AS [Name0], [r4].[String] AS [String0], [r2].[Id] AS [Id1], [r2].[Int] AS [Int1], [r2].[Ints] AS [Ints1], [r2].[Name] AS [Name1], [r2].[String] AS [String1], [r3].[Id] AS [Id2], [r3].[Int] AS [Int2], [r3].[Ints] AS [Ints2], [r3].[Name] AS [Name2], [r3].[String] AS [String2]
+    FROM [RelatedCollection] AS [r1]
+    LEFT JOIN [RelatedCollection_OptionalNested] AS [r2] ON [r1].[RootEntityId] = [r2].[AssociateTypeRootEntityId] AND [r1].[Id] = [r2].[AssociateTypeId]
+    LEFT JOIN [RelatedCollection_RequiredNested] AS [r3] ON [r1].[RootEntityId] = [r3].[AssociateTypeRootEntityId] AND [r1].[Id] = [r3].[AssociateTypeId]
+    LEFT JOIN [RelatedCollection_NestedCollection] AS [r4] ON [r1].[RootEntityId] = [r4].[AssociateTypeRootEntityId] AND [r1].[Id] = [r4].[AssociateTypeId]
+) AS [s] ON [r5].[Id] = [s].[RootEntityId]
+ORDER BY [r].[Id], [r5].[Id], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[AssociateTypeRootEntityId0], [s].[AssociateTypeId0], [s].[AssociateTypeRootEntityId1], [s].[AssociateTypeId1]
+""");
+        }
+    }
+
     public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
     {
         await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior);
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingPrimitiveCollectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingPrimitiveCollectionJetTest.cs
deleted file mode 100644
index ed041afb..00000000
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingPrimitiveCollectionJetTest.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Query.Associations.OwnedTableSplitting;
-
-public class OwnedTableSplittingPrimitiveCollectionJetTest(
-    OwnedTableSplittingJetFixture fixture,
-    ITestOutputHelper testOutputHelper)
-    : OwnedTableSplittingPrimitiveCollectionRelationalTestBase<OwnedTableSplittingJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Count()
-    {
-        await base.Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[OptionalNestedAssociate_Id], [s].[OptionalNestedAssociate_Int], [s].[OptionalNestedAssociate_Ints], [s].[OptionalNestedAssociate_Name], [s].[OptionalNestedAssociate_String], [s].[RequiredNestedAssociate_Id], [s].[RequiredNestedAssociate_Int], [s].[RequiredNestedAssociate_Ints], [s].[RequiredNestedAssociate_Name], [s].[RequiredNestedAssociate_String], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [o].[AssociateTypeRootEntityId], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r3].[AssociateTypeRootEntityId], [r3].[Id], [r3].[Int], [r3].[Ints], [r3].[Name], [r3].[String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-LEFT JOIN (
-    SELECT [r1].[RootEntityId], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[AssociateTypeRootEntityId], [r2].[AssociateTypeId], [r2].[Id] AS [Id0], [r2].[Int] AS [Int0], [r2].[Ints] AS [Ints0], [r2].[Name] AS [Name0], [r2].[String] AS [String0], [r1].[OptionalNestedAssociate_Id], [r1].[OptionalNestedAssociate_Int], [r1].[OptionalNestedAssociate_Ints], [r1].[OptionalNestedAssociate_Name], [r1].[OptionalNestedAssociate_String], [r1].[RequiredNestedAssociate_Id], [r1].[RequiredNestedAssociate_Int], [r1].[RequiredNestedAssociate_Ints], [r1].[RequiredNestedAssociate_Name], [r1].[RequiredNestedAssociate_String]
-    FROM [RelatedCollection] AS [r1]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r2] ON [r1].[RootEntityId] = [r2].[AssociateTypeRootEntityId] AND [r1].[Id] = [r2].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o] ON CASE
-    WHEN [r].[OptionalAssociate_Id] IS NOT NULL AND [r].[OptionalAssociate_Int] IS NOT NULL AND [r].[OptionalAssociate_Ints] IS NOT NULL AND [r].[OptionalAssociate_Name] IS NOT NULL AND [r].[OptionalAssociate_String] IS NOT NULL THEN [r].[Id]
-END = [o].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r3] ON [r].[Id] = [r3].[AssociateTypeRootEntityId]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) AS [r0]) = 3
-ORDER BY [r].[Id], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [o].[AssociateTypeRootEntityId], [o].[Id], [r3].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Index()
-    {
-        await base.Index();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[OptionalNestedAssociate_Id], [s].[OptionalNestedAssociate_Int], [s].[OptionalNestedAssociate_Ints], [s].[OptionalNestedAssociate_Name], [s].[OptionalNestedAssociate_String], [s].[RequiredNestedAssociate_Id], [s].[RequiredNestedAssociate_Int], [s].[RequiredNestedAssociate_Ints], [s].[RequiredNestedAssociate_Name], [s].[RequiredNestedAssociate_String], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [o].[AssociateTypeRootEntityId], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r2].[AssociateTypeRootEntityId], [r2].[Id], [r2].[Int], [r2].[Ints], [r2].[Name], [r2].[String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-LEFT JOIN (
-    SELECT [r0].[RootEntityId], [r0].[Id], [r0].[Int], [r0].[Ints], [r0].[Name], [r0].[String], [r1].[AssociateTypeRootEntityId], [r1].[AssociateTypeId], [r1].[Id] AS [Id0], [r1].[Int] AS [Int0], [r1].[Ints] AS [Ints0], [r1].[Name] AS [Name0], [r1].[String] AS [String0], [r0].[OptionalNestedAssociate_Id], [r0].[OptionalNestedAssociate_Int], [r0].[OptionalNestedAssociate_Ints], [r0].[OptionalNestedAssociate_Name], [r0].[OptionalNestedAssociate_String], [r0].[RequiredNestedAssociate_Id], [r0].[RequiredNestedAssociate_Int], [r0].[RequiredNestedAssociate_Ints], [r0].[RequiredNestedAssociate_Name], [r0].[RequiredNestedAssociate_String]
-    FROM [RelatedCollection] AS [r0]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r1] ON [r0].[RootEntityId] = [r1].[AssociateTypeRootEntityId] AND [r0].[Id] = [r1].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o] ON CASE
-    WHEN [r].[OptionalAssociate_Id] IS NOT NULL AND [r].[OptionalAssociate_Int] IS NOT NULL AND [r].[OptionalAssociate_Ints] IS NOT NULL AND [r].[OptionalAssociate_Name] IS NOT NULL AND [r].[OptionalAssociate_String] IS NOT NULL THEN [r].[Id]
-END = [o].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r2] ON [r].[Id] = [r2].[AssociateTypeRootEntityId]
-WHERE CAST(JSON_VALUE([r].[RequiredAssociate_Ints], '$[0]') AS int) = 1
-ORDER BY [r].[Id], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [o].[AssociateTypeRootEntityId], [o].[Id], [r2].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Contains()
-    {
-        await base.Contains();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[OptionalNestedAssociate_Id], [s].[OptionalNestedAssociate_Int], [s].[OptionalNestedAssociate_Ints], [s].[OptionalNestedAssociate_Name], [s].[OptionalNestedAssociate_String], [s].[RequiredNestedAssociate_Id], [s].[RequiredNestedAssociate_Int], [s].[RequiredNestedAssociate_Ints], [s].[RequiredNestedAssociate_Name], [s].[RequiredNestedAssociate_String], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [o].[AssociateTypeRootEntityId], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r3].[AssociateTypeRootEntityId], [r3].[Id], [r3].[Int], [r3].[Ints], [r3].[Name], [r3].[String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-LEFT JOIN (
-    SELECT [r1].[RootEntityId], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[AssociateTypeRootEntityId], [r2].[AssociateTypeId], [r2].[Id] AS [Id0], [r2].[Int] AS [Int0], [r2].[Ints] AS [Ints0], [r2].[Name] AS [Name0], [r2].[String] AS [String0], [r1].[OptionalNestedAssociate_Id], [r1].[OptionalNestedAssociate_Int], [r1].[OptionalNestedAssociate_Ints], [r1].[OptionalNestedAssociate_Name], [r1].[OptionalNestedAssociate_String], [r1].[RequiredNestedAssociate_Id], [r1].[RequiredNestedAssociate_Int], [r1].[RequiredNestedAssociate_Ints], [r1].[RequiredNestedAssociate_Name], [r1].[RequiredNestedAssociate_String]
-    FROM [RelatedCollection] AS [r1]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r2] ON [r1].[RootEntityId] = [r2].[AssociateTypeRootEntityId] AND [r1].[Id] = [r2].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o] ON CASE
-    WHEN [r].[OptionalAssociate_Id] IS NOT NULL AND [r].[OptionalAssociate_Int] IS NOT NULL AND [r].[OptionalAssociate_Ints] IS NOT NULL AND [r].[OptionalAssociate_Name] IS NOT NULL AND [r].[OptionalAssociate_String] IS NOT NULL THEN [r].[Id]
-END = [o].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r3] ON [r].[Id] = [r3].[AssociateTypeRootEntityId]
-WHERE 3 IN (
-    SELECT [r0].[value]
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) WITH ([value] int '$') AS [r0]
-)
-ORDER BY [r].[Id], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [o].[AssociateTypeRootEntityId], [o].[Id], [r3].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Any_predicate()
-    {
-        await base.Any_predicate();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[OptionalNestedAssociate_Id], [s].[OptionalNestedAssociate_Int], [s].[OptionalNestedAssociate_Ints], [s].[OptionalNestedAssociate_Name], [s].[OptionalNestedAssociate_String], [s].[RequiredNestedAssociate_Id], [s].[RequiredNestedAssociate_Int], [s].[RequiredNestedAssociate_Ints], [s].[RequiredNestedAssociate_Name], [s].[RequiredNestedAssociate_String], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [o].[AssociateTypeRootEntityId], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r3].[AssociateTypeRootEntityId], [r3].[Id], [r3].[Int], [r3].[Ints], [r3].[Name], [r3].[String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-LEFT JOIN (
-    SELECT [r1].[RootEntityId], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[AssociateTypeRootEntityId], [r2].[AssociateTypeId], [r2].[Id] AS [Id0], [r2].[Int] AS [Int0], [r2].[Ints] AS [Ints0], [r2].[Name] AS [Name0], [r2].[String] AS [String0], [r1].[OptionalNestedAssociate_Id], [r1].[OptionalNestedAssociate_Int], [r1].[OptionalNestedAssociate_Ints], [r1].[OptionalNestedAssociate_Name], [r1].[OptionalNestedAssociate_String], [r1].[RequiredNestedAssociate_Id], [r1].[RequiredNestedAssociate_Int], [r1].[RequiredNestedAssociate_Ints], [r1].[RequiredNestedAssociate_Name], [r1].[RequiredNestedAssociate_String]
-    FROM [RelatedCollection] AS [r1]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r2] ON [r1].[RootEntityId] = [r2].[AssociateTypeRootEntityId] AND [r1].[Id] = [r2].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o] ON CASE
-    WHEN [r].[OptionalAssociate_Id] IS NOT NULL AND [r].[OptionalAssociate_Int] IS NOT NULL AND [r].[OptionalAssociate_Ints] IS NOT NULL AND [r].[OptionalAssociate_Name] IS NOT NULL AND [r].[OptionalAssociate_String] IS NOT NULL THEN [r].[Id]
-END = [o].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r3] ON [r].[Id] = [r3].[AssociateTypeRootEntityId]
-WHERE 2 IN (
-    SELECT [r0].[value]
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) WITH ([value] int '$') AS [r0]
-)
-ORDER BY [r].[Id], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [o].[AssociateTypeRootEntityId], [o].[Id], [r3].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Nested_Count()
-    {
-        await base.Nested_Count();
-
-        AssertSql(
-            """
-SELECT [r].[Id], [r].[Name], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[OptionalNestedAssociate_Id], [s].[OptionalNestedAssociate_Int], [s].[OptionalNestedAssociate_Ints], [s].[OptionalNestedAssociate_Name], [s].[OptionalNestedAssociate_String], [s].[RequiredNestedAssociate_Id], [s].[RequiredNestedAssociate_Int], [s].[RequiredNestedAssociate_Ints], [s].[RequiredNestedAssociate_Name], [s].[RequiredNestedAssociate_String], [r].[OptionalAssociate_Id], [r].[OptionalAssociate_Int], [r].[OptionalAssociate_Ints], [r].[OptionalAssociate_Name], [r].[OptionalAssociate_String], [o].[AssociateTypeRootEntityId], [o].[Id], [o].[Int], [o].[Ints], [o].[Name], [o].[String], [r].[OptionalAssociate_OptionalNestedAssociate_Id], [r].[OptionalAssociate_OptionalNestedAssociate_Int], [r].[OptionalAssociate_OptionalNestedAssociate_Ints], [r].[OptionalAssociate_OptionalNestedAssociate_Name], [r].[OptionalAssociate_OptionalNestedAssociate_String], [r].[OptionalAssociate_RequiredNestedAssociate_Id], [r].[OptionalAssociate_RequiredNestedAssociate_Int], [r].[OptionalAssociate_RequiredNestedAssociate_Ints], [r].[OptionalAssociate_RequiredNestedAssociate_Name], [r].[OptionalAssociate_RequiredNestedAssociate_String], [r].[RequiredAssociate_Id], [r].[RequiredAssociate_Int], [r].[RequiredAssociate_Ints], [r].[RequiredAssociate_Name], [r].[RequiredAssociate_String], [r3].[AssociateTypeRootEntityId], [r3].[Id], [r3].[Int], [r3].[Ints], [r3].[Name], [r3].[String], [r].[RequiredAssociate_OptionalNestedAssociate_Id], [r].[RequiredAssociate_OptionalNestedAssociate_Int], [r].[RequiredAssociate_OptionalNestedAssociate_Ints], [r].[RequiredAssociate_OptionalNestedAssociate_Name], [r].[RequiredAssociate_OptionalNestedAssociate_String], [r].[RequiredAssociate_RequiredNestedAssociate_Id], [r].[RequiredAssociate_RequiredNestedAssociate_Int], [r].[RequiredAssociate_RequiredNestedAssociate_Ints], [r].[RequiredAssociate_RequiredNestedAssociate_Name], [r].[RequiredAssociate_RequiredNestedAssociate_String]
-FROM [RootEntity] AS [r]
-LEFT JOIN (
-    SELECT [r1].[RootEntityId], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[AssociateTypeRootEntityId], [r2].[AssociateTypeId], [r2].[Id] AS [Id0], [r2].[Int] AS [Int0], [r2].[Ints] AS [Ints0], [r2].[Name] AS [Name0], [r2].[String] AS [String0], [r1].[OptionalNestedAssociate_Id], [r1].[OptionalNestedAssociate_Int], [r1].[OptionalNestedAssociate_Ints], [r1].[OptionalNestedAssociate_Name], [r1].[OptionalNestedAssociate_String], [r1].[RequiredNestedAssociate_Id], [r1].[RequiredNestedAssociate_Int], [r1].[RequiredNestedAssociate_Ints], [r1].[RequiredNestedAssociate_Name], [r1].[RequiredNestedAssociate_String]
-    FROM [RelatedCollection] AS [r1]
-    LEFT JOIN [RelatedCollection_NestedCollection] AS [r2] ON [r1].[RootEntityId] = [r2].[AssociateTypeRootEntityId] AND [r1].[Id] = [r2].[AssociateTypeId]
-) AS [s] ON [r].[Id] = [s].[RootEntityId]
-LEFT JOIN [OptionalRelated_NestedCollection] AS [o] ON CASE
-    WHEN [r].[OptionalAssociate_Id] IS NOT NULL AND [r].[OptionalAssociate_Int] IS NOT NULL AND [r].[OptionalAssociate_Ints] IS NOT NULL AND [r].[OptionalAssociate_Name] IS NOT NULL AND [r].[OptionalAssociate_String] IS NOT NULL THEN [r].[Id]
-END = [o].[AssociateTypeRootEntityId]
-LEFT JOIN [RequiredRelated_NestedCollection] AS [r3] ON [r].[Id] = [r3].[AssociateTypeRootEntityId]
-WHERE (
-    SELECT COUNT(*)
-    FROM OPENJSON([r].[RequiredAssociate_RequiredNestedAssociate_Ints]) AS [r0]) = 3
-ORDER BY [r].[Id], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [o].[AssociateTypeRootEntityId], [o].[Id], [r3].[AssociateTypeRootEntityId]
-""");
-    }
-
-    public override async Task Select_Sum()
-    {
-        await base.Select_Sum();
-
-        AssertSql(
-            """
-SELECT (
-    SELECT COALESCE(SUM([r1].[value]), 0)
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) WITH ([value] int '$') AS [r1])
-FROM [RootEntity] AS [r]
-WHERE (
-    SELECT COALESCE(SUM([r0].[value]), 0)
-    FROM OPENJSON([r].[RequiredAssociate_Ints]) WITH ([value] int '$') AS [r0]) >= 6
-""");
-    }
-
-    [ConditionalFact]
-    public virtual void Check_all_tests_overridden()
-        => TestHelpers.AssertAllMethodsOverridden(GetType());
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionJetTest.cs
index c62c6768..b4c2f7a1 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionJetTest.cs
@@ -360,6 +360,31 @@ WHEN [r].[OptionalAssociate_Id] IS NOT NULL AND [r].[OptionalAssociate_Int] IS N
 
     #region Subquery
 
+    public override async Task Select_subquery_FirstOrDefault_complex_collection(QueryTrackingBehavior queryTrackingBehavior)
+    {
+        await base.Select_subquery_FirstOrDefault_complex_collection(queryTrackingBehavior);
+
+        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
+        {
+            AssertSql(
+                """
+SELECT [r].[Id], [r3].[Id], [s].[RootEntityId], [s].[Id], [s].[Int], [s].[Ints], [s].[Name], [s].[String], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId], [s].[Id0], [s].[Int0], [s].[Ints0], [s].[Name0], [s].[String0], [s].[OptionalNestedAssociate_Id], [s].[OptionalNestedAssociate_Int], [s].[OptionalNestedAssociate_Ints], [s].[OptionalNestedAssociate_Name], [s].[OptionalNestedAssociate_String], [s].[RequiredNestedAssociate_Id], [s].[RequiredNestedAssociate_Int], [s].[RequiredNestedAssociate_Ints], [s].[RequiredNestedAssociate_Name], [s].[RequiredNestedAssociate_String], [r3].[c]
+FROM [RootEntity] AS [r]
+OUTER APPLY (
+    SELECT TOP(1) 1 AS [c], [r0].[Id]
+    FROM [RootEntity] AS [r0]
+    ORDER BY [r0].[Id]
+) AS [r3]
+LEFT JOIN (
+    SELECT [r1].[RootEntityId], [r1].[Id], [r1].[Int], [r1].[Ints], [r1].[Name], [r1].[String], [r2].[AssociateTypeRootEntityId], [r2].[AssociateTypeId], [r2].[Id] AS [Id0], [r2].[Int] AS [Int0], [r2].[Ints] AS [Ints0], [r2].[Name] AS [Name0], [r2].[String] AS [String0], [r1].[OptionalNestedAssociate_Id], [r1].[OptionalNestedAssociate_Int], [r1].[OptionalNestedAssociate_Ints], [r1].[OptionalNestedAssociate_Name], [r1].[OptionalNestedAssociate_String], [r1].[RequiredNestedAssociate_Id], [r1].[RequiredNestedAssociate_Int], [r1].[RequiredNestedAssociate_Ints], [r1].[RequiredNestedAssociate_Name], [r1].[RequiredNestedAssociate_String]
+    FROM [RelatedCollection] AS [r1]
+    LEFT JOIN [RelatedCollection_NestedCollection] AS [r2] ON [r1].[RootEntityId] = [r2].[AssociateTypeRootEntityId] AND [r1].[Id] = [r2].[AssociateTypeId]
+) AS [s] ON [r3].[Id] = [s].[RootEntityId]
+ORDER BY [r].[Id], [r3].[Id], [s].[RootEntityId], [s].[Id], [s].[AssociateTypeRootEntityId], [s].[AssociateTypeId]
+""");
+        }
+    }
+
     public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior)
     {
         await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior);
diff --git a/test/EFCore.Jet.FunctionalTests/Query/DbFunctionsJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/DbFunctionsJetTest.cs
index 7bec0cbb..2052f20b 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/DbFunctionsJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/DbFunctionsJetTest.cs
@@ -452,9 +452,9 @@ await AssertQueryScalar(
 
             AssertSql(
                 """
-SELECT CBOOL(ISDATE(`o`.`CustomerID`)) * -1
+SELECT CBOOL(ISDATE(`o`.`CustomerID`))
 FROM `Orders` AS `o`
-WHERE NOT (CBOOL(ISDATE(`o`.`CustomerID`)) * -1)
+WHERE NOT (CBOOL(ISDATE(`o`.`CustomerID`)))
 """);
         }
 
@@ -471,9 +471,9 @@ await AssertQueryScalar(
 
             AssertSql(
                 """
-SELECT CBOOL(ISDATE(IIF((`o`.`OrderDate` & '') IS NULL, '', (`o`.`OrderDate` & '')))) * -1
+SELECT CBOOL(ISDATE(IIF((`o`.`OrderDate` & '') IS NULL, '', (`o`.`OrderDate` & ''))))
 FROM `Orders` AS `o`
-WHERE CBOOL(ISDATE(IIF((`o`.`OrderDate` & '') IS NULL, '', (`o`.`OrderDate` & '')))) * -1
+WHERE CBOOL(ISDATE(IIF((`o`.`OrderDate` & '') IS NULL, '', (`o`.`OrderDate` & ''))))
 """);
         }
 
@@ -492,7 +492,7 @@ await AssertCount(
                 """
 SELECT COUNT(*)
 FROM `Orders` AS `o`
-WHERE CBOOL(ISDATE(IIF(`o`.`CustomerID` IS NULL, '', `o`.`CustomerID`) & (`o`.`OrderID` & ''))) * -1
+WHERE CBOOL(ISDATE(IIF(`o`.`CustomerID` IS NULL, '', `o`.`CustomerID`) & (`o`.`OrderID` & '')))
 """);
         }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/EntitySplittingQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/EntitySplittingQueryJetTest.cs
index 68b73c80..3e3f0d61 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/EntitySplittingQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/EntitySplittingQueryJetTest.cs
@@ -766,4 +766,16 @@ public override async Task Tpc_entity_owning_a_split_collection_on_leaf(bool asy
 
         AssertSql();
     }
+
+    public override async Task Compare_split_entity_to_null(bool async)
+    {
+        await base.Compare_split_entity_to_null(async);
+
+        AssertSql(
+            """
+SELECT `e`.`Id`, `e`.`EntityThreeId`, `e`.`IntValue1`, `e`.`IntValue2`, `s`.`IntValue3`, `e`.`IntValue4`, `e`.`StringValue1`, `e`.`StringValue2`, `e`.`StringValue3`, `e`.`StringValue4`
+FROM `EntityOne` AS `e`
+INNER JOIN `SplitEntityOnePart` AS `s` ON `e`.`Id` = `s`.`Id`
+""");
+    }
 }
diff --git a/test/EFCore.Jet.FunctionalTests/Query/GearsOfWarQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/GearsOfWarQueryJetTest.cs
index b29969aa..f7438e12 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/GearsOfWarQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/GearsOfWarQueryJetTest.cs
@@ -5878,11 +5878,11 @@ public override async Task
             await base.Null_semantics_is_correctly_applied_for_function_comparisons_that_take_arguments_from_optional_navigation(isAsync);
 
             AssertSql(
-"""
+                """
 SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`
 FROM `Tags` AS `t`
 LEFT JOIN `Gears` AS `g` ON `t`.`GearNickName` = `g`.`Nickname` AND `t`.`GearSquadId` = `g`.`SquadId`
-WHERE IIF(`g`.`SquadId` IS NULL, NULL, MID(`t`.`Note`, 0 + 1, `g`.`SquadId`)) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR `g`.`SquadId` IS NULL) AND `t`.`GearNickName` IS NULL)
+WHERE IIF(`g`.`SquadId` IS NULL, NULL, MID(`t`.`Note`, IIF(0 = -1, 0, 0) + 1, `g`.`SquadId`)) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR IIF(0 = -1, 0, 0) IS NULL OR `g`.`SquadId` IS NULL) AND `t`.`GearNickName` IS NULL)
 """);
         }
 
@@ -5893,12 +5893,12 @@ await base.Null_semantics_is_correctly_applied_for_function_comparisons_that_tak
                 isAsync);
 
             AssertSql(
-"""
+                """
 SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`
 FROM (`Tags` AS `t`
 LEFT JOIN `Gears` AS `g` ON `t`.`GearNickName` = `g`.`Nickname` AND `t`.`GearSquadId` = `g`.`SquadId`)
 LEFT JOIN `Squads` AS `s` ON `g`.`SquadId` = `s`.`Id`
-WHERE IIF(LEN(`s`.`Name`) IS NULL, NULL, MID(`t`.`Note`, 0 + 1, IIF(LEN(`s`.`Name`) IS NULL, NULL, CLNG(LEN(`s`.`Name`))))) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR `s`.`Name` IS NULL) AND `t`.`GearNickName` IS NULL)
+WHERE IIF(LEN(`s`.`Name`) IS NULL, NULL, MID(`t`.`Note`, IIF(0 = -1, 0, 0) + 1, IIF(LEN(`s`.`Name`) IS NULL, NULL, CLNG(LEN(`s`.`Name`))))) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR IIF(0 = -1, 0, 0) IS NULL OR `s`.`Name` IS NULL) AND `t`.`GearNickName` IS NULL)
 """);
         }
 
@@ -7905,8 +7905,8 @@ public override async Task Projecting_property_converted_to_nullable_with_functi
             await base.Projecting_property_converted_to_nullable_with_function_call(async);
 
             AssertSql(
-"""
-SELECT MID(IIF(`t`.`GearNickName` IS NOT NULL, `g`.`Nickname`, NULL), 0 + 1, 3)
+                """
+SELECT MID(IIF(`t`.`GearNickName` IS NOT NULL, `g`.`Nickname`, NULL), IIF(0 = -1, 0, 0) + 1, 3)
 FROM `Tags` AS `t`
 LEFT JOIN `Gears` AS `g` ON `t`.`GearNickName` = `g`.`Nickname` AND `t`.`GearSquadId` = `g`.`SquadId`
 """);
@@ -7917,8 +7917,8 @@ public override async Task Projecting_property_converted_to_nullable_with_functi
             await base.Projecting_property_converted_to_nullable_with_function_call2(async);
 
             AssertSql(
-"""
-SELECT `t`.`Note`, MID(`t`.`Note`, 0 + 1, IIF(`t`.`GearNickName` IS NOT NULL, `g`.`SquadId`, NULL)) AS `Function`
+                """
+SELECT `t`.`Note`, MID(`t`.`Note`, IIF(0 = -1, 0, 0) + 1, IIF(`t`.`GearNickName` IS NOT NULL, `g`.`SquadId`, NULL)) AS `Function`
 FROM `Tags` AS `t`
 LEFT JOIN `Gears` AS `g` ON `t`.`GearNickName` = `g`.`Nickname` AND `t`.`GearSquadId` = `g`.`SquadId`
 WHERE IIF(`t`.`GearNickName` IS NOT NULL, `g`.`Nickname`, NULL) IS NOT NULL
diff --git a/test/EFCore.Jet.FunctionalTests/Query/ManyToManyNoTrackingQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/ManyToManyNoTrackingQueryJetTest.cs
index 670748df..3a22ec49 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/ManyToManyNoTrackingQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/ManyToManyNoTrackingQueryJetTest.cs
@@ -126,13 +126,13 @@ public override async Task Skip_navigation_long_count_without_predicate(bool asy
 
         AssertSql(
 """
-SELECT [e].[Id], [e].[CollectionInverseId], [e].[ExtraId], [e].[Name], [e].[ReferenceInverseId]
-FROM [EntityTwos] AS [e]
-WHERE (
-    SELECT COUNT_BIG(*)
-    FROM [JoinTwoToThree] AS [j]
-    INNER JOIN [EntityThrees] AS [e0] ON [j].[ThreeId] = [e0].[Id]
-    WHERE [e].[Id] = [j].[TwoId]) > CAST(0 AS bigint)
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`
+FROM `EntityTwos` AS `e`
+WHERE EXISTS (
+    SELECT 1
+    FROM `JoinTwoToThree` AS `j`
+    INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
+    WHERE `e`.`Id` = `j`.`TwoId`)
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/ManyToManyQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/ManyToManyQueryJetTest.cs
index 29a96e19..8ff5f174 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/ManyToManyQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/ManyToManyQueryJetTest.cs
@@ -126,13 +126,13 @@ public override async Task Skip_navigation_long_count_without_predicate(bool asy
 
         AssertSql(
 """
-SELECT [e].[Id], [e].[CollectionInverseId], [e].[ExtraId], [e].[Name], [e].[ReferenceInverseId]
-FROM [EntityTwos] AS [e]
-WHERE (
-    SELECT COUNT_BIG(*)
-    FROM [JoinTwoToThree] AS [j]
-    INNER JOIN [EntityThrees] AS [e0] ON [j].[ThreeId] = [e0].[Id]
-    WHERE [e].[Id] = [j].[TwoId]) > CAST(0 AS bigint)
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`
+FROM `EntityTwos` AS `e`
+WHERE EXISTS (
+    SELECT 1
+    FROM `JoinTwoToThree` AS `j`
+    INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
+    WHERE `e`.`Id` = `j`.`TwoId`)
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindGroupByQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindGroupByQueryJetTest.cs
index ea4451da..b53ce599 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindGroupByQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindGroupByQueryJetTest.cs
@@ -1487,7 +1487,7 @@ public override async Task GroupBy_complex_key_aggregate(bool async)
                 """
 SELECT `s`.`Key`, COUNT(*) AS `Count`
 FROM (
-    SELECT MID(`c`.`CustomerID`, 0 + 1, 1) AS `Key`
+    SELECT MID(`c`.`CustomerID`, IIF(0 = -1, 0, 0) + 1, 1) AS `Key`
     FROM `Orders` AS `o`
     LEFT JOIN `Customers` AS `c` ON `o`.`CustomerID` = `c`.`CustomerID`
 ) AS `s`
diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindJoinQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindJoinQueryJetTest.cs
index 426d97f2..d13d29f5 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindJoinQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindJoinQueryJetTest.cs
@@ -54,13 +54,13 @@ public override async Task Join_select_many(bool isAsync)
             await base.Join_select_many(isAsync);
 
             AssertSql(
-                $"""
-                    SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `e`.`EmployeeID`, `e`.`City`, `e`.`Country`, `e`.`FirstName`, `e`.`ReportsTo`, `e`.`Title`
-                    FROM `Customers` AS `c`
-                    INNER JOIN `Orders` AS `o` ON `c`.`CustomerID` = `o`.`CustomerID`,
-                    `Employees` AS `e`
-                    WHERE `c`.`CustomerID` LIKE 'F%'
-                    """);
+                """
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `e`.`EmployeeID`, `e`.`City`, `e`.`Country`, `e`.`FirstName`, `e`.`ReportsTo`, `e`.`Title`
+FROM (`Customers` AS `c`
+INNER JOIN `Orders` AS `o` ON `c`.`CustomerID` = `o`.`CustomerID`),
+`Employees` AS `e`
+WHERE `c`.`CustomerID` LIKE 'F%'
+""");
         }
 
         public override async Task Client_Join_select_many(bool isAsync)
@@ -1039,14 +1039,14 @@ public override async Task GroupJoin_subquery_projection_outer_mixed(bool async)
 
             AssertSql(
                 """
-SELECT [c].[CustomerID] AS [A], [t].[CustomerID] AS [B], [o0].[CustomerID] AS [C]
-FROM [Customers] AS [c]
-CROSS JOIN (
-    SELECT TOP(1) [o].[CustomerID]
-    FROM [Orders] AS [o]
-    ORDER BY [o].[OrderID]
-) AS [t]
-INNER JOIN [Orders] AS [o0] ON [c].[CustomerID] = [o0].[CustomerID]
+SELECT `c`.`CustomerID` AS `A`, `o0`.`CustomerID` AS `B`, `o1`.`CustomerID` AS `C`
+FROM (`Customers` AS `c`
+INNER JOIN `Orders` AS `o1` ON `c`.`CustomerID` = `o1`.`CustomerID`),
+(
+    SELECT TOP 1 `o`.`CustomerID`
+    FROM `Orders` AS `o`
+    ORDER BY `o`.`OrderID`
+) AS `o0`
 """);
         }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs
index 1b19186d..7cd3b39a 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs
@@ -3254,6 +3254,20 @@ public override async Task Parameter_extraction_short_circuits_3(bool isAsync)
 """);
         }
 
+        public override async Task Captured_variable_from_switch_case_pattern_matching(bool async)
+        {
+            await base.Captured_variable_from_switch_case_pattern_matching(async);
+
+            AssertSql(
+                """
+@customerId='ALFKI' (Size = 5)
+
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
+FROM `Customers` AS `c`
+WHERE `c`.`CustomerID` = @customerId
+""");
+        }
+
         public override async Task Subquery_member_pushdown_does_not_change_original_subquery_model(bool isAsync)
         {
             await base.Subquery_member_pushdown_does_not_change_original_subquery_model(isAsync);
diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryFiltersQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryFiltersQueryJetTest.cs
index f651988d..7de9f860 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryFiltersQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryFiltersQueryJetTest.cs
@@ -234,7 +234,7 @@ INNER JOIN (
     LEFT JOIN (
         SELECT `c0`.`CustomerID`, `c0`.`CompanyName`
         FROM `Customers` AS `c0`
-        WHERE `c0`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@ef_filter__TenantPrefix_startswith")}
+        WHERE `c0`.`CompanyName` LIKE @ef_filter__TenantPrefix_startswith
     ) AS `c1` ON `o`.`CustomerID` = `c1`.`CustomerID`
     WHERE `c1`.`CustomerID` IS NOT NULL AND `c1`.`CompanyName` IS NOT NULL
 ) AS `s` ON `c`.`CustomerID` = `s`.`CustomerID`)
@@ -247,13 +247,13 @@ INNER JOIN (
         LEFT JOIN (
             SELECT `c2`.`CustomerID`, `c2`.`CompanyName`
             FROM `Customers` AS `c2`
-            WHERE `c2`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@ef_filter__TenantPrefix_startswith")}
+            WHERE `c2`.`CompanyName` LIKE @ef_filter__TenantPrefix_startswith
         ) AS `c3` ON `o1`.`CustomerID` = `c3`.`CustomerID`
         WHERE `c3`.`CustomerID` IS NOT NULL AND `c3`.`CompanyName` IS NOT NULL
     ) AS `s0` ON `o0`.`OrderID` = `s0`.`OrderID`
-    WHERE `o0`.`Quantity` > {AssertSqlHelper.Parameter("@ef_filter___quantity")}
+    WHERE `o0`.`Quantity` > @ef_filter___quantity
 ) AS `s1` ON `s`.`OrderID` = `s1`.`OrderID`
-WHERE ((`c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@ef_filter__TenantPrefix_startswith")}) AND `s1`.`Discount` < 10) AND (`s`.`OrderID` IS NOT NULL AND `s1`.`OrderID` IS NOT NULL)
+WHERE ((`c`.`CompanyName` LIKE @ef_filter__TenantPrefix_startswith) AND `s1`.`Discount` < 10) AND (`s`.`OrderID` IS NOT NULL AND `s1`.`OrderID` IS NOT NULL)
 """);
         }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindSelectQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindSelectQueryJetTest.cs
index d9ea12a6..103f4e46 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindSelectQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindSelectQueryJetTest.cs
@@ -2141,7 +2141,7 @@ public override async Task Projection_Distinct_projection_preserves_columns_used
                 """
 SELECT (IIF(`c0`.`FirstLetter` IS NULL, '', `c0`.`FirstLetter`) & ' ') & `c0`.`Foo` AS `Aggregate`
 FROM (
-    SELECT DISTINCT `c`.`CustomerID`, MID(`c`.`CustomerID`, 0 + 1, 1) AS `FirstLetter`, 'Foo' AS `Foo`
+    SELECT DISTINCT `c`.`CustomerID`, MID(`c`.`CustomerID`, IIF(0 = -1, 0, 0) + 1, 1) AS `FirstLetter`, 'Foo' AS `Foo`
     FROM `Customers` AS `c`
 ) AS `c0`
 """);
diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQueryJetTest.cs
index 7f576fb4..fd0a0b34 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQueryJetTest.cs
@@ -651,27 +651,27 @@ public override async Task Include_collection_on_additional_from_clause_with_fil
         await base.Include_collection_on_additional_from_clause_with_filter(async);
 
         AssertSql(
-"""
-SELECT [t].[CustomerID], [t].[Address], [t].[City], [t].[CompanyName], [t].[ContactName], [t].[ContactTitle], [t].[Country], [t].[Fax], [t].[Phone], [t].[PostalCode], [t].[Region], [c].[CustomerID]
-FROM [Customers] AS [c]
-CROSS JOIN (
-    SELECT [c0].[CustomerID], [c0].[Address], [c0].[City], [c0].[CompanyName], [c0].[ContactName], [c0].[ContactTitle], [c0].[Country], [c0].[Fax], [c0].[Phone], [c0].[PostalCode], [c0].[Region]
-    FROM [Customers] AS [c0]
-    WHERE [c0].[CustomerID] = N'ALFKI'
-) AS [t]
-ORDER BY [c].[CustomerID], [t].[CustomerID]
+            """
+SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`, `c`.`CustomerID`
+FROM `Customers` AS `c`,
+(
+    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+    FROM `Customers` AS `c0`
+    WHERE `c0`.`CustomerID` = 'ALFKI'
+) AS `c1`
+ORDER BY `c`.`CustomerID`, `c1`.`CustomerID`
 """,
-//
-"""
-SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [c].[CustomerID], [t].[CustomerID]
-FROM [Customers] AS [c]
-CROSS JOIN (
-    SELECT [c0].[CustomerID]
-    FROM [Customers] AS [c0]
-    WHERE [c0].[CustomerID] = N'ALFKI'
-) AS [t]
-INNER JOIN [Orders] AS [o] ON [t].[CustomerID] = [o].[CustomerID]
-ORDER BY [c].[CustomerID], [t].[CustomerID]
+            //
+            """
+SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c`.`CustomerID`, `c1`.`CustomerID`
+FROM `Customers` AS `c`,
+((
+    SELECT `c0`.`CustomerID`
+    FROM `Customers` AS `c0`
+    WHERE `c0`.`CustomerID` = 'ALFKI'
+) AS `c1`
+INNER JOIN `Orders` AS `o` ON `c1`.`CustomerID` = `o`.`CustomerID`)
+ORDER BY `c`.`CustomerID`, `c1`.`CustomerID`
 """);
     }
 
@@ -983,29 +983,29 @@ public override async Task Include_collection_with_cross_join_clause_with_filter
         await base.Include_collection_with_cross_join_clause_with_filter(async);
 
         AssertSql(
-"""
-SELECT [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region], [t].[OrderID]
-FROM [Customers] AS [c]
-CROSS JOIN (
-    SELECT TOP(5) [o].[OrderID]
-    FROM [Orders] AS [o]
-    ORDER BY [o].[OrderID]
-) AS [t]
-WHERE [c].[CustomerID] LIKE N'F%'
-ORDER BY [c].[CustomerID], [t].[OrderID]
+            """
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o0`.`OrderID`
+FROM `Customers` AS `c`,
+(
+    SELECT TOP 5 `o`.`OrderID`
+    FROM `Orders` AS `o`
+    ORDER BY `o`.`OrderID`
+) AS `o0`
+WHERE `c`.`CustomerID` LIKE 'F%'
+ORDER BY `c`.`CustomerID`, `o0`.`OrderID`
 """,
-//
-"""
-SELECT [o0].[OrderID], [o0].[CustomerID], [o0].[EmployeeID], [o0].[OrderDate], [c].[CustomerID], [t].[OrderID]
-FROM [Customers] AS [c]
-CROSS JOIN (
-    SELECT TOP(5) [o].[OrderID]
-    FROM [Orders] AS [o]
-    ORDER BY [o].[OrderID]
-) AS [t]
-INNER JOIN [Orders] AS [o0] ON [c].[CustomerID] = [o0].[CustomerID]
-WHERE [c].[CustomerID] LIKE N'F%'
-ORDER BY [c].[CustomerID], [t].[OrderID]
+            //
+            """
+SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `c`.`CustomerID`, `o0`.`OrderID`
+FROM (`Customers` AS `c`
+INNER JOIN `Orders` AS `o1` ON `c`.`CustomerID` = `o1`.`CustomerID`),
+(
+    SELECT TOP 5 `o`.`OrderID`
+    FROM `Orders` AS `o`
+    ORDER BY `o`.`OrderID`
+) AS `o0`
+WHERE `c`.`CustomerID` LIKE 'F%'
+ORDER BY `c`.`CustomerID`, `o0`.`OrderID`
 """);
     }
 
@@ -1484,59 +1484,62 @@ public override async Task Include_duplicate_collection(bool async)
 
         AssertSql(
 """
-@__p_0='2'
-
-SELECT [t].[CustomerID], [t].[Address], [t].[City], [t].[CompanyName], [t].[ContactName], [t].[ContactTitle], [t].[Country], [t].[Fax], [t].[Phone], [t].[PostalCode], [t].[Region], [t0].[CustomerID], [t0].[Address], [t0].[City], [t0].[CompanyName], [t0].[ContactName], [t0].[ContactTitle], [t0].[Country], [t0].[Fax], [t0].[Phone], [t0].[PostalCode], [t0].[Region]
+SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`, `c2`.`CustomerID`, `c2`.`Address`, `c2`.`City`, `c2`.`CompanyName`, `c2`.`ContactName`, `c2`.`ContactTitle`, `c2`.`Country`, `c2`.`Fax`, `c2`.`Phone`, `c2`.`PostalCode`, `c2`.`Region`
 FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID], [c0].[Address], [c0].[City], [c0].[CompanyName], [c0].[ContactName], [c0].[ContactTitle], [c0].[Country], [c0].[Fax], [c0].[Phone], [c0].[PostalCode], [c0].[Region]
-    FROM [Customers] AS [c0]
-    ORDER BY [c0].[CustomerID]
-    OFFSET 2 ROWS FETCH NEXT 2 ROWS ONLY
-) AS [t0]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+    SELECT TOP @p `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`,
+(
+    SELECT TOP 2 `c3`.`CustomerID`, `c3`.`Address`, `c3`.`City`, `c3`.`CompanyName`, `c3`.`ContactName`, `c3`.`ContactTitle`, `c3`.`Country`, `c3`.`Fax`, `c3`.`Phone`, `c3`.`PostalCode`, `c3`.`Region`
+    FROM (
+        SELECT TOP 2 + 2 `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+        FROM `Customers` AS `c0`
+        ORDER BY `c0`.`CustomerID`
+    ) AS `c3`
+    ORDER BY `c3`.`CustomerID` DESC
+) AS `c2`
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """,
-//
-"""
-@__p_0='2'
-
-SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [t].[CustomerID], [t0].[CustomerID]
-FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID]
-    FROM [Customers] AS [c0]
-    ORDER BY [c0].[CustomerID]
-    OFFSET 2 ROWS FETCH NEXT 2 ROWS ONLY
-) AS [t0]
-INNER JOIN [Orders] AS [o] ON [t].[CustomerID] = [o].[CustomerID]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+                //
+                """
+SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c1`.`CustomerID`, `c2`.`CustomerID`
+FROM ((
+    SELECT TOP @p `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`
+INNER JOIN `Orders` AS `o` ON `c1`.`CustomerID` = `o`.`CustomerID`),
+(
+    SELECT TOP 2 `c3`.`CustomerID`
+    FROM (
+        SELECT TOP 2 + 2 `c0`.`CustomerID`
+        FROM `Customers` AS `c0`
+        ORDER BY `c0`.`CustomerID`
+    ) AS `c3`
+    ORDER BY `c3`.`CustomerID` DESC
+) AS `c2`
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """,
-//
-"""
-@__p_0='2'
-
-SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [t].[CustomerID], [t0].[CustomerID]
+                //
+                """
+SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `c1`.`CustomerID`, `c2`.`CustomerID`
 FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID]
-    FROM [Customers] AS [c0]
-    ORDER BY [c0].[CustomerID]
-    OFFSET 2 ROWS FETCH NEXT 2 ROWS ONLY
-) AS [t0]
-INNER JOIN [Orders] AS [o] ON [t0].[CustomerID] = [o].[CustomerID]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+    SELECT TOP @p `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`,
+((
+    SELECT TOP 2 `c3`.`CustomerID`
+    FROM (
+        SELECT TOP 2 + 2 `c0`.`CustomerID`
+        FROM `Customers` AS `c0`
+        ORDER BY `c0`.`CustomerID`
+    ) AS `c3`
+    ORDER BY `c3`.`CustomerID` DESC
+) AS `c2`
+INNER JOIN `Orders` AS `o0` ON `c2`.`CustomerID` = `o0`.`CustomerID`)
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """);
     }
 
@@ -2157,39 +2160,35 @@ public override async Task Include_collection_on_additional_from_clause(bool asy
         await base.Include_collection_on_additional_from_clause(async);
 
         AssertSql(
-"""
-@__p_0='5'
-
-SELECT [t0].[CustomerID], [t0].[Address], [t0].[City], [t0].[CompanyName], [t0].[ContactName], [t0].[ContactTitle], [t0].[Country], [t0].[Fax], [t0].[Phone], [t0].[PostalCode], [t0].[Region], [t].[CustomerID]
+            """
+SELECT `c2`.`CustomerID`, `c2`.`Address`, `c2`.`City`, `c2`.`CompanyName`, `c2`.`ContactName`, `c2`.`ContactTitle`, `c2`.`Country`, `c2`.`Fax`, `c2`.`Phone`, `c2`.`PostalCode`, `c2`.`Region`, `c1`.`CustomerID`
 FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID], [c0].[Address], [c0].[City], [c0].[CompanyName], [c0].[ContactName], [c0].[ContactTitle], [c0].[Country], [c0].[Fax], [c0].[Phone], [c0].[PostalCode], [c0].[Region]
-    FROM [Customers] AS [c0]
-    WHERE [c0].[CustomerID] LIKE N'F%'
-) AS [t0]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+    SELECT TOP @p `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`,
+(
+    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+    FROM `Customers` AS `c0`
+    WHERE `c0`.`CustomerID` LIKE 'F%'
+) AS `c2`
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """,
-//
-"""
-@__p_0='5'
-
-SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [t].[CustomerID], [t0].[CustomerID]
+            //
+            """
+SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c1`.`CustomerID`, `c2`.`CustomerID`
 FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID]
-    FROM [Customers] AS [c0]
-    WHERE [c0].[CustomerID] LIKE N'F%'
-) AS [t0]
-INNER JOIN [Orders] AS [o] ON [t0].[CustomerID] = [o].[CustomerID]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+    SELECT TOP @p `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`,
+((
+    SELECT `c0`.`CustomerID`
+    FROM `Customers` AS `c0`
+    WHERE `c0`.`CustomerID` LIKE 'F%'
+) AS `c2`
+INNER JOIN `Orders` AS `o` ON `c2`.`CustomerID` = `o`.`CustomerID`)
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindSplitIncludeQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindSplitIncludeQueryJetTest.cs
index 37171d92..0eebbdd2 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindSplitIncludeQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindSplitIncludeQueryJetTest.cs
@@ -765,29 +765,29 @@ public override async Task Include_collection_with_cross_join_clause_with_filter
         await base.Include_collection_with_cross_join_clause_with_filter(async);
 
         AssertSql(
-"""
-SELECT [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region], [t].[OrderID]
-FROM [Customers] AS [c]
-CROSS JOIN (
-    SELECT TOP(5) [o].[OrderID]
-    FROM [Orders] AS [o]
-    ORDER BY [o].[OrderID]
-) AS [t]
-WHERE [c].[CustomerID] LIKE N'F%'
-ORDER BY [c].[CustomerID], [t].[OrderID]
+            """
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o0`.`OrderID`
+FROM `Customers` AS `c`,
+(
+    SELECT TOP 5 `o`.`OrderID`
+    FROM `Orders` AS `o`
+    ORDER BY `o`.`OrderID`
+) AS `o0`
+WHERE `c`.`CustomerID` LIKE 'F%'
+ORDER BY `c`.`CustomerID`, `o0`.`OrderID`
 """,
-//
-"""
-SELECT [o0].[OrderID], [o0].[CustomerID], [o0].[EmployeeID], [o0].[OrderDate], [c].[CustomerID], [t].[OrderID]
-FROM [Customers] AS [c]
-CROSS JOIN (
-    SELECT TOP(5) [o].[OrderID]
-    FROM [Orders] AS [o]
-    ORDER BY [o].[OrderID]
-) AS [t]
-INNER JOIN [Orders] AS [o0] ON [c].[CustomerID] = [o0].[CustomerID]
-WHERE [c].[CustomerID] LIKE N'F%'
-ORDER BY [c].[CustomerID], [t].[OrderID]
+            //
+            """
+SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `c`.`CustomerID`, `o0`.`OrderID`
+FROM (`Customers` AS `c`
+INNER JOIN `Orders` AS `o1` ON `c`.`CustomerID` = `o1`.`CustomerID`),
+(
+    SELECT TOP 5 `o`.`OrderID`
+    FROM `Orders` AS `o`
+    ORDER BY `o`.`OrderID`
+) AS `o0`
+WHERE `c`.`CustomerID` LIKE 'F%'
+ORDER BY `c`.`CustomerID`, `o0`.`OrderID`
 """);
     }
 
@@ -862,27 +862,27 @@ public override async Task Include_collection_on_additional_from_clause_with_fil
         await base.Include_collection_on_additional_from_clause_with_filter(async);
 
         AssertSql(
-"""
-SELECT [t].[CustomerID], [t].[Address], [t].[City], [t].[CompanyName], [t].[ContactName], [t].[ContactTitle], [t].[Country], [t].[Fax], [t].[Phone], [t].[PostalCode], [t].[Region], [c].[CustomerID]
-FROM [Customers] AS [c]
-CROSS JOIN (
-    SELECT [c0].[CustomerID], [c0].[Address], [c0].[City], [c0].[CompanyName], [c0].[ContactName], [c0].[ContactTitle], [c0].[Country], [c0].[Fax], [c0].[Phone], [c0].[PostalCode], [c0].[Region]
-    FROM [Customers] AS [c0]
-    WHERE [c0].[CustomerID] = N'ALFKI'
-) AS [t]
-ORDER BY [c].[CustomerID], [t].[CustomerID]
+            """
+SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`, `c`.`CustomerID`
+FROM `Customers` AS `c`,
+(
+    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+    FROM `Customers` AS `c0`
+    WHERE `c0`.`CustomerID` = 'ALFKI'
+) AS `c1`
+ORDER BY `c`.`CustomerID`, `c1`.`CustomerID`
 """,
-//
-"""
-SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [c].[CustomerID], [t].[CustomerID]
-FROM [Customers] AS [c]
-CROSS JOIN (
-    SELECT [c0].[CustomerID]
-    FROM [Customers] AS [c0]
-    WHERE [c0].[CustomerID] = N'ALFKI'
-) AS [t]
-INNER JOIN [Orders] AS [o] ON [t].[CustomerID] = [o].[CustomerID]
-ORDER BY [c].[CustomerID], [t].[CustomerID]
+            //
+            """
+SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c`.`CustomerID`, `c1`.`CustomerID`
+FROM `Customers` AS `c`,
+((
+    SELECT `c0`.`CustomerID`
+    FROM `Customers` AS `c0`
+    WHERE `c0`.`CustomerID` = 'ALFKI'
+) AS `c1`
+INNER JOIN `Orders` AS `o` ON `c1`.`CustomerID` = `o`.`CustomerID`)
+ORDER BY `c`.`CustomerID`, `c1`.`CustomerID`
 """);
     }
 
@@ -891,39 +891,35 @@ public override async Task Include_collection_on_additional_from_clause(bool asy
         await base.Include_collection_on_additional_from_clause(async);
 
         AssertSql(
-"""
-@__p_0='5'
-
-SELECT [t0].[CustomerID], [t0].[Address], [t0].[City], [t0].[CompanyName], [t0].[ContactName], [t0].[ContactTitle], [t0].[Country], [t0].[Fax], [t0].[Phone], [t0].[PostalCode], [t0].[Region], [t].[CustomerID]
+            """
+SELECT `c2`.`CustomerID`, `c2`.`Address`, `c2`.`City`, `c2`.`CompanyName`, `c2`.`ContactName`, `c2`.`ContactTitle`, `c2`.`Country`, `c2`.`Fax`, `c2`.`Phone`, `c2`.`PostalCode`, `c2`.`Region`, `c1`.`CustomerID`
 FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID], [c0].[Address], [c0].[City], [c0].[CompanyName], [c0].[ContactName], [c0].[ContactTitle], [c0].[Country], [c0].[Fax], [c0].[Phone], [c0].[PostalCode], [c0].[Region]
-    FROM [Customers] AS [c0]
-    WHERE [c0].[CustomerID] LIKE N'F%'
-) AS [t0]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+    SELECT TOP @p `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`,
+(
+    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+    FROM `Customers` AS `c0`
+    WHERE `c0`.`CustomerID` LIKE 'F%'
+) AS `c2`
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """,
-//
-"""
-@__p_0='5'
-
-SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [t].[CustomerID], [t0].[CustomerID]
+            //
+            """
+SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c1`.`CustomerID`, `c2`.`CustomerID`
 FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID]
-    FROM [Customers] AS [c0]
-    WHERE [c0].[CustomerID] LIKE N'F%'
-) AS [t0]
-INNER JOIN [Orders] AS [o] ON [t0].[CustomerID] = [o].[CustomerID]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+    SELECT TOP @p `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`,
+((
+    SELECT `c0`.`CustomerID`
+    FROM `Customers` AS `c0`
+    WHERE `c0`.`CustomerID` LIKE 'F%'
+) AS `c2`
+INNER JOIN `Orders` AS `o` ON `c2`.`CustomerID` = `o`.`CustomerID`)
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """);
     }
 
@@ -933,59 +929,62 @@ public override async Task Include_duplicate_collection(bool async)
 
         AssertSql(
 """
-@__p_0='2'
-
-SELECT [t].[CustomerID], [t].[Address], [t].[City], [t].[CompanyName], [t].[ContactName], [t].[ContactTitle], [t].[Country], [t].[Fax], [t].[Phone], [t].[PostalCode], [t].[Region], [t0].[CustomerID], [t0].[Address], [t0].[City], [t0].[CompanyName], [t0].[ContactName], [t0].[ContactTitle], [t0].[Country], [t0].[Fax], [t0].[Phone], [t0].[PostalCode], [t0].[Region]
+SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`, `c2`.`CustomerID`, `c2`.`Address`, `c2`.`City`, `c2`.`CompanyName`, `c2`.`ContactName`, `c2`.`ContactTitle`, `c2`.`Country`, `c2`.`Fax`, `c2`.`Phone`, `c2`.`PostalCode`, `c2`.`Region`
 FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID], [c0].[Address], [c0].[City], [c0].[CompanyName], [c0].[ContactName], [c0].[ContactTitle], [c0].[Country], [c0].[Fax], [c0].[Phone], [c0].[PostalCode], [c0].[Region]
-    FROM [Customers] AS [c0]
-    ORDER BY [c0].[CustomerID]
-    OFFSET 2 ROWS FETCH NEXT 2 ROWS ONLY
-) AS [t0]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+    SELECT TOP @p `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`,
+(
+    SELECT TOP 2 `c3`.`CustomerID`, `c3`.`Address`, `c3`.`City`, `c3`.`CompanyName`, `c3`.`ContactName`, `c3`.`ContactTitle`, `c3`.`Country`, `c3`.`Fax`, `c3`.`Phone`, `c3`.`PostalCode`, `c3`.`Region`
+    FROM (
+        SELECT TOP 2 + 2 `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+        FROM `Customers` AS `c0`
+        ORDER BY `c0`.`CustomerID`
+    ) AS `c3`
+    ORDER BY `c3`.`CustomerID` DESC
+) AS `c2`
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """,
-//
-"""
-@__p_0='2'
-
-SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [t].[CustomerID], [t0].[CustomerID]
-FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID]
-    FROM [Customers] AS [c0]
-    ORDER BY [c0].[CustomerID]
-    OFFSET 2 ROWS FETCH NEXT 2 ROWS ONLY
-) AS [t0]
-INNER JOIN [Orders] AS [o] ON [t].[CustomerID] = [o].[CustomerID]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+                //
+                """
+SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c1`.`CustomerID`, `c2`.`CustomerID`
+FROM ((
+    SELECT TOP @p `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`
+INNER JOIN `Orders` AS `o` ON `c1`.`CustomerID` = `o`.`CustomerID`),
+(
+    SELECT TOP 2 `c3`.`CustomerID`
+    FROM (
+        SELECT TOP 2 + 2 `c0`.`CustomerID`
+        FROM `Customers` AS `c0`
+        ORDER BY `c0`.`CustomerID`
+    ) AS `c3`
+    ORDER BY `c3`.`CustomerID` DESC
+) AS `c2`
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """,
-//
-"""
-@__p_0='2'
-
-SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], [t].[CustomerID], [t0].[CustomerID]
+                //
+                """
+SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `c1`.`CustomerID`, `c2`.`CustomerID`
 FROM (
-    SELECT TOP(@__p_0) [c].[CustomerID]
-    FROM [Customers] AS [c]
-    ORDER BY [c].[CustomerID]
-) AS [t]
-CROSS JOIN (
-    SELECT [c0].[CustomerID]
-    FROM [Customers] AS [c0]
-    ORDER BY [c0].[CustomerID]
-    OFFSET 2 ROWS FETCH NEXT 2 ROWS ONLY
-) AS [t0]
-INNER JOIN [Orders] AS [o] ON [t0].[CustomerID] = [o].[CustomerID]
-ORDER BY [t].[CustomerID], [t0].[CustomerID]
+    SELECT TOP @p `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    ORDER BY `c`.`CustomerID`
+) AS `c1`,
+((
+    SELECT TOP 2 `c3`.`CustomerID`
+    FROM (
+        SELECT TOP 2 + 2 `c0`.`CustomerID`
+        FROM `Customers` AS `c0`
+        ORDER BY `c0`.`CustomerID`
+    ) AS `c3`
+    ORDER BY `c3`.`CustomerID` DESC
+) AS `c2`
+INNER JOIN `Orders` AS `o0` ON `c2`.`CustomerID` = `o0`.`CustomerID`)
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/NullSemanticsQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NullSemanticsQueryJetTest.cs
index cbd39fbc..0a1747d2 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/NullSemanticsQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/NullSemanticsQueryJetTest.cs
@@ -3144,17 +3144,17 @@ public override async Task Null_semantics_applied_when_comparing_two_functions_w
             await base.Null_semantics_applied_when_comparing_two_functions_with_multiple_nullable_arguments(async);
 
             AssertSql(
-                $"""
-                    SELECT `e`.`Id`
-                    FROM `Entities1` AS `e`
-                    WHERE (REPLACE(`e`.`NullableStringA`, `e`.`NullableStringB`, `e`.`NullableStringC`) = `e`.`NullableStringA`) OR (REPLACE(`e`.`NullableStringA`, `e`.`NullableStringB`, `e`.`NullableStringC`) IS NULL AND `e`.`NullableStringA` IS NULL)
-                    """,
+                """
+SELECT `e`.`Id`
+FROM `Entities1` AS `e`
+WHERE IIF(`e`.`NullableStringA` IS NULL OR `e`.`NullableStringB` IS NULL OR `e`.`NullableStringC` IS NULL, NULL, REPLACE(IIF(`e`.`NullableStringA` IS NULL, '', `e`.`NullableStringA`), IIF(`e`.`NullableStringB` IS NULL, CHR(1), `e`.`NullableStringB`), IIF(`e`.`NullableStringC` IS NULL, CHR(1), `e`.`NullableStringC`))) = `e`.`NullableStringA` OR ((`e`.`NullableStringA` IS NULL OR `e`.`NullableStringB` IS NULL OR `e`.`NullableStringC` IS NULL) AND `e`.`NullableStringA` IS NULL)
+""",
                 //
-                $"""
-                    SELECT `e`.`Id`
-                    FROM `Entities1` AS `e`
-                    WHERE ((REPLACE(`e`.`NullableStringA`, `e`.`NullableStringB`, `e`.`NullableStringC`) <> `e`.`NullableStringA`) OR (REPLACE(`e`.`NullableStringA`, `e`.`NullableStringB`, `e`.`NullableStringC`) IS NULL OR `e`.`NullableStringA` IS NULL)) AND (REPLACE(`e`.`NullableStringA`, `e`.`NullableStringB`, `e`.`NullableStringC`) IS NOT NULL OR `e`.`NullableStringA` IS NOT NULL)
-                    """);
+                """
+SELECT `e`.`Id`
+FROM `Entities1` AS `e`
+WHERE (IIF(`e`.`NullableStringA` IS NULL OR `e`.`NullableStringB` IS NULL OR `e`.`NullableStringC` IS NULL, NULL, REPLACE(IIF(`e`.`NullableStringA` IS NULL, '', `e`.`NullableStringA`), IIF(`e`.`NullableStringB` IS NULL, CHR(1), `e`.`NullableStringB`), IIF(`e`.`NullableStringC` IS NULL, CHR(1), `e`.`NullableStringC`))) <> `e`.`NullableStringA` OR `e`.`NullableStringA` IS NULL OR `e`.`NullableStringB` IS NULL OR `e`.`NullableStringC` IS NULL OR `e`.`NullableStringA` IS NULL) AND ((`e`.`NullableStringA` IS NOT NULL AND `e`.`NullableStringB` IS NOT NULL AND `e`.`NullableStringC` IS NOT NULL) OR `e`.`NullableStringA` IS NOT NULL)
+""");
         }
 
         public override async Task Null_semantics_coalesce(bool async)
@@ -3227,10 +3227,10 @@ public override async Task Null_semantics_function(bool async)
             await base.Null_semantics_function(async);
 
             AssertSql(
-"""
+                """
 SELECT `e`.`Id`
 FROM `Entities1` AS `e`
-WHERE (MID(`e`.`NullableStringA`, 0 + 1, `e`.`IntA`) <> `e`.`NullableStringB` OR `e`.`NullableStringA` IS NULL OR `e`.`NullableStringB` IS NULL) AND (`e`.`NullableStringA` IS NOT NULL OR `e`.`NullableStringB` IS NOT NULL)
+WHERE (MID(`e`.`NullableStringA`, IIF(0 = -1, 0, 0) + 1, `e`.`IntA`) <> `e`.`NullableStringB` OR `e`.`NullableStringA` IS NULL OR IIF(0 = -1, 0, 0) IS NULL OR `e`.`NullableStringB` IS NULL) AND ((`e`.`NullableStringA` IS NOT NULL AND IIF(0 = -1, 0, 0) IS NOT NULL) OR `e`.`NullableStringB` IS NOT NULL)
 """);
         }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/PrimitiveCollectionsQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/PrimitiveCollectionsQueryJetTest.cs
index 357f9067..864233d3 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/PrimitiveCollectionsQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/PrimitiveCollectionsQueryJetTest.cs
@@ -686,6 +686,13 @@ public override async Task Parameter_collection_of_nullable_ints_Contains_nullab
 """);
     }
 
+    public override async Task Parameter_collection_of_nullable_ints_Contains_nullable_int_with_EF_Parameter()
+    {
+        await Assert.ThrowsAsync<InvalidOperationException>(base.Parameter_collection_of_nullable_ints_Contains_nullable_int_with_EF_Parameter);
+
+        AssertSql();
+    }
+
     public override async Task Parameter_collection_of_strings_Contains_string()
     {
         await base.Parameter_collection_of_strings_Contains_string();
diff --git a/test/EFCore.Jet.FunctionalTests/Query/SqlQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/SqlQueryJetTest.cs
index cef2b524..11cbfd83 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/SqlQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/SqlQueryJetTest.cs
@@ -470,7 +470,7 @@ public override async Task SqlQueryRaw_composed_with_predicate(bool async)
 FROM (
     SELECT * FROM `Customers`
 ) AS `m`
-WHERE MID(`m`.`ContactName`, 0 + 1, 1) = MID(`m`.`CompanyName`, 0 + 1, 1)
+WHERE MID(`m`.`ContactName`, IIF(0 = -1, 0, 0) + 1, 1) = MID(`m`.`CompanyName`, IIF(0 = -1, 0, 0) + 1, 1)
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/TPCGearsOfWarQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/TPCGearsOfWarQueryJetTest.cs
index 8dd28b6f..07254eea 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/TPCGearsOfWarQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/TPCGearsOfWarQueryJetTest.cs
@@ -8002,7 +8002,7 @@ UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
 ) AS `u` ON `t`.`GearNickName` = `u`.`Nickname` AND `t`.`GearSquadId` = `u`.`SquadId`
-WHERE IIF(`u`.`SquadId` IS NULL, NULL, MID(`t`.`Note`, 0 + 1, `u`.`SquadId`)) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR `u`.`SquadId` IS NULL) AND `t`.`GearNickName` IS NULL)
+WHERE IIF(`u`.`SquadId` IS NULL, NULL, MID(`t`.`Note`, IIF(0 = -1, 0, 0) + 1, `u`.`SquadId`)) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR IIF(0 = -1, 0, 0) IS NULL OR `u`.`SquadId` IS NULL) AND `t`.`GearNickName` IS NULL)
 """);
     }
 
@@ -8024,7 +8024,7 @@ UNION ALL
     FROM `Officers` AS `o`
 ) AS `u` ON `t`.`GearNickName` = `u`.`Nickname` AND `t`.`GearSquadId` = `u`.`SquadId`)
 LEFT JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
-WHERE IIF(LEN(`s`.`Name`) IS NULL, NULL, MID(`t`.`Note`, 0 + 1, IIF(LEN(`s`.`Name`) IS NULL, NULL, CLNG(LEN(`s`.`Name`))))) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR `s`.`Name` IS NULL) AND `t`.`GearNickName` IS NULL)
+WHERE IIF(LEN(`s`.`Name`) IS NULL, NULL, MID(`t`.`Note`, IIF(0 = -1, 0, 0) + 1, IIF(LEN(`s`.`Name`) IS NULL, NULL, CLNG(LEN(`s`.`Name`))))) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR IIF(0 = -1, 0, 0) IS NULL OR `s`.`Name` IS NULL) AND `t`.`GearNickName` IS NULL)
 """);
     }
 
@@ -10625,7 +10625,7 @@ public override async Task Projecting_property_converted_to_nullable_with_functi
 
         AssertSql(
             """
-SELECT MID(IIF(`t`.`GearNickName` IS NOT NULL, `u`.`Nickname`, NULL), 0 + 1, 3)
+SELECT MID(IIF(`t`.`GearNickName` IS NOT NULL, `u`.`Nickname`, NULL), IIF(0 = -1, 0, 0) + 1, 3)
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -10643,7 +10643,7 @@ public override async Task Projecting_property_converted_to_nullable_with_functi
 
         AssertSql(
             """
-SELECT `t`.`Note`, MID(`t`.`Note`, 0 + 1, IIF(`t`.`GearNickName` IS NOT NULL, `u`.`SquadId`, NULL)) AS `Function`
+SELECT `t`.`Note`, MID(`t`.`Note`, IIF(0 = -1, 0, 0) + 1, IIF(`t`.`GearNickName` IS NOT NULL, `u`.`SquadId`, NULL)) AS `Function`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
diff --git a/test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyNoTrackingQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyNoTrackingQueryJetTest.cs
index d19d0903..e668ffb1 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyNoTrackingQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyNoTrackingQueryJetTest.cs
@@ -134,13 +134,13 @@ public override async Task Skip_navigation_long_count_without_predicate(bool asy
 
         AssertSql(
 """
-SELECT [e].[Id], [e].[CollectionInverseId], [e].[ExtraId], [e].[Name], [e].[ReferenceInverseId]
-FROM [EntityTwos] AS [e]
-WHERE (
-    SELECT COUNT_BIG(*)
-    FROM [JoinTwoToThree] AS [j]
-    INNER JOIN [EntityThrees] AS [e0] ON [j].[ThreeId] = [e0].[Id]
-    WHERE [e].[Id] = [j].[TwoId]) > CAST(0 AS bigint)
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`
+FROM `EntityTwos` AS `e`
+WHERE EXISTS (
+    SELECT 1
+    FROM `JoinTwoToThree` AS `j`
+    INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
+    WHERE `e`.`Id` = `j`.`TwoId`)
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyQueryJetTest.cs
index 6dbd6182..94bfc9ec 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/TPCManyToManyQueryJetTest.cs
@@ -134,13 +134,13 @@ public override async Task Skip_navigation_long_count_without_predicate(bool asy
 
         AssertSql(
 """
-SELECT [e].[Id], [e].[CollectionInverseId], [e].[ExtraId], [e].[Name], [e].[ReferenceInverseId]
-FROM [EntityTwos] AS [e]
-WHERE (
-    SELECT COUNT_BIG(*)
-    FROM [JoinTwoToThree] AS [j]
-    INNER JOIN [EntityThrees] AS [e0] ON [j].[ThreeId] = [e0].[Id]
-    WHERE [e].[Id] = [j].[TwoId]) > CAST(0 AS bigint)
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`
+FROM `EntityTwos` AS `e`
+WHERE EXISTS (
+    SELECT 1
+    FROM `JoinTwoToThree` AS `j`
+    INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
+    WHERE `e`.`Id` = `j`.`TwoId`)
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/TPTGearsOfWarQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/TPTGearsOfWarQueryJetTest.cs
index c77f01d3..6f6957e7 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/TPTGearsOfWarQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/TPTGearsOfWarQueryJetTest.cs
@@ -6409,7 +6409,7 @@ LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
     FROM `Gears` AS `g`
 ) AS `s` ON `t`.`GearNickName` = `s`.`Nickname` AND `t`.`GearSquadId` = `s`.`SquadId`
-WHERE IIF(`s`.`SquadId` IS NULL, NULL, MID(`t`.`Note`, 0 + 1, `s`.`SquadId`)) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR `s`.`SquadId` IS NULL) AND `t`.`GearNickName` IS NULL)
+WHERE IIF(`s`.`SquadId` IS NULL, NULL, MID(`t`.`Note`, IIF(0 = -1, 0, 0) + 1, `s`.`SquadId`)) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR IIF(0 = -1, 0, 0) IS NULL OR `s`.`SquadId` IS NULL) AND `t`.`GearNickName` IS NULL)
 """);
     }
 
@@ -6428,7 +6428,7 @@ LEFT JOIN (
     FROM `Gears` AS `g`
 ) AS `s` ON `t`.`GearNickName` = `s`.`Nickname` AND `t`.`GearSquadId` = `s`.`SquadId`)
 LEFT JOIN `Squads` AS `s0` ON `s`.`SquadId` = `s0`.`Id`
-WHERE IIF(LEN(`s0`.`Name`) IS NULL, NULL, MID(`t`.`Note`, 0 + 1, IIF(LEN(`s0`.`Name`) IS NULL, NULL, CLNG(LEN(`s0`.`Name`))))) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR `s0`.`Name` IS NULL) AND `t`.`GearNickName` IS NULL)
+WHERE IIF(LEN(`s0`.`Name`) IS NULL, NULL, MID(`t`.`Note`, IIF(0 = -1, 0, 0) + 1, IIF(LEN(`s0`.`Name`) IS NULL, NULL, CLNG(LEN(`s0`.`Name`))))) = `t`.`GearNickName` OR ((`t`.`Note` IS NULL OR IIF(0 = -1, 0, 0) IS NULL OR `s0`.`Name` IS NULL) AND `t`.`GearNickName` IS NULL)
 """);
     }
 
@@ -8492,7 +8492,7 @@ public override async Task Projecting_property_converted_to_nullable_with_functi
 
         AssertSql(
             """
-SELECT MID(IIF(`t`.`GearNickName` IS NOT NULL, `s`.`Nickname`, NULL), 0 + 1, 3)
+SELECT MID(IIF(`t`.`GearNickName` IS NOT NULL, `s`.`Nickname`, NULL), IIF(0 = -1, 0, 0) + 1, 3)
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -8507,7 +8507,7 @@ public override async Task Projecting_property_converted_to_nullable_with_functi
 
         AssertSql(
             """
-SELECT `t`.`Note`, MID(`t`.`Note`, 0 + 1, IIF(`t`.`GearNickName` IS NOT NULL, `s`.`SquadId`, NULL)) AS `Function`
+SELECT `t`.`Note`, MID(`t`.`Note`, IIF(0 = -1, 0, 0) + 1, IIF(`t`.`GearNickName` IS NOT NULL, `s`.`SquadId`, NULL)) AS `Function`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
diff --git a/test/EFCore.Jet.FunctionalTests/Query/TPTManyToManyNoTrackingQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/TPTManyToManyNoTrackingQueryJetTest.cs
index 2a24d370..96ba481a 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/TPTManyToManyNoTrackingQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/TPTManyToManyNoTrackingQueryJetTest.cs
@@ -133,13 +133,13 @@ public override async Task Skip_navigation_long_count_without_predicate(bool asy
 
         AssertSql(
 """
-SELECT [e].[Id], [e].[CollectionInverseId], [e].[ExtraId], [e].[Name], [e].[ReferenceInverseId]
-FROM [EntityTwos] AS [e]
-WHERE (
-    SELECT COUNT_BIG(*)
-    FROM [JoinTwoToThree] AS [j]
-    INNER JOIN [EntityThrees] AS [e0] ON [j].[ThreeId] = [e0].[Id]
-    WHERE [e].[Id] = [j].[TwoId]) > CAST(0 AS bigint)
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`
+FROM `EntityTwos` AS `e`
+WHERE EXISTS (
+    SELECT 1
+    FROM `JoinTwoToThree` AS `j`
+    INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
+    WHERE `e`.`Id` = `j`.`TwoId`)
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/TPTManyToManyQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/TPTManyToManyQueryJetTest.cs
index 7b7f2497..245d528a 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/TPTManyToManyQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/TPTManyToManyQueryJetTest.cs
@@ -132,13 +132,13 @@ public override async Task Skip_navigation_long_count_without_predicate(bool asy
 
         AssertSql(
 """
-SELECT [e].[Id], [e].[CollectionInverseId], [e].[ExtraId], [e].[Name], [e].[ReferenceInverseId]
-FROM [EntityTwos] AS [e]
-WHERE (
-    SELECT COUNT_BIG(*)
-    FROM [JoinTwoToThree] AS [j]
-    INNER JOIN [EntityThrees] AS [e0] ON [j].[ThreeId] = [e0].[Id]
-    WHERE [e].[Id] = [j].[TwoId]) > CAST(0 AS bigint)
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`
+FROM `EntityTwos` AS `e`
+WHERE EXISTS (
+    SELECT 1
+    FROM `JoinTwoToThree` AS `j`
+    INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
+    WHERE `e`.`Id` = `j`.`TwoId`)
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Translations/BasicTypesQueryJetFixture.cs b/test/EFCore.Jet.FunctionalTests/Query/Translations/BasicTypesQueryJetFixture.cs
index 9c6b85e5..7a368f24 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/Translations/BasicTypesQueryJetFixture.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/Translations/BasicTypesQueryJetFixture.cs
@@ -94,7 +94,7 @@ public override ISetSource GetExpectedData()
         result.BasicTypesEntities.ForEach(b =>
         {
             b.DateTime = new DateTime(b.DateTime.Year, b.DateTime.Month, b.DateTime.Day, b.DateTime.Hour, b.DateTime.Minute, b.DateTime.Second);
-            b.DateTimeOffset = new DateTimeOffset(b.DateTimeOffset.Year, b.DateTimeOffset.Month, b.DateTimeOffset.Day, b.DateTimeOffset.Hour, b.DateTimeOffset.Minute, b.DateTimeOffset.Second, b.DateTimeOffset.Offset);
+            b.DateTimeOffset = new DateTimeOffset(b.DateTimeOffset.Year, b.DateTimeOffset.Month, b.DateTimeOffset.Day, b.DateTimeOffset.Hour, b.DateTimeOffset.Minute, b.DateTimeOffset.Second, b.DateTimeOffset.Offset).ToUniversalTime();
             b.TimeOnly = new TimeOnly(b.TimeOnly.Hour, b.TimeOnly.Minute, b.TimeOnly.Second);
             b.TimeSpan = new TimeSpan(b.TimeSpan.Days, b.TimeSpan.Hours, b.TimeSpan.Minutes, b.TimeSpan.Seconds);
             if (b.DateOnly.Year < 100)
@@ -119,7 +119,7 @@ public override ISetSource GetExpectedData()
             }
             if (b.DateTimeOffset.HasValue)
             {
-                b.DateTimeOffset = new DateTimeOffset(b.DateTimeOffset.Value.Year, b.DateTimeOffset.Value.Month, b.DateTimeOffset.Value.Day, b.DateTimeOffset.Value.Hour, b.DateTimeOffset.Value.Minute, b.DateTimeOffset.Value.Second, b.DateTimeOffset.Value.Offset);
+                b.DateTimeOffset = new DateTimeOffset(b.DateTimeOffset.Value.Year, b.DateTimeOffset.Value.Month, b.DateTimeOffset.Value.Day, b.DateTimeOffset.Value.Hour, b.DateTimeOffset.Value.Minute, b.DateTimeOffset.Value.Second, b.DateTimeOffset.Value.Offset).ToUniversalTime();
             }
             if (b.TimeOnly.HasValue)
             {
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Translations/MiscellaneousTranslationsJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Translations/MiscellaneousTranslationsJetTest.cs
index 3537f026..0ef87138 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/Translations/MiscellaneousTranslationsJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/Translations/MiscellaneousTranslationsJetTest.cs
@@ -1,8 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query.Translations;
+using Microsoft.EntityFrameworkCore.TestModels.BasicTypesModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
@@ -83,55 +87,55 @@ public override async Task Convert_ToBoolean()
         await base.Convert_ToBoolean();
 
         AssertSql(
-            """
+"""
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE CBOOL(`b`.`Bool`) * -1
+WHERE CBOOL(`b`.`Bool`)
 """,
-            //
-            """
+                //
+                """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
 WHERE CBOOL(`b`.`Byte`)
 """,
-            //
-            """
+                //
+                """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
 WHERE CBOOL(`b`.`Decimal`)
 """,
-            //
-            """
+                //
+                """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
 WHERE CBOOL(`b`.`Double`)
 """,
-            //
-            """
+                //
+                """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
 WHERE CBOOL(`b`.`Float`)
 """,
-            //
-            """
+                //
+                """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
 WHERE CBOOL(`b`.`Short`)
 """,
-            //
-            """
+                //
+                """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
 WHERE CBOOL(`b`.`Int`)
 """,
-            //
-            """
+                //
+                """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
 WHERE CBOOL(`b`.`Long`)
 """,
-            //
-            """
+                //
+                """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
 WHERE CBOOL(`b`.`Int`)
@@ -142,65 +146,65 @@ public override async Task Convert_ToByte()
     {
         await base.Convert_ToByte();
 
-AssertSql(
+        AssertSql(
 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE CONVERT(tinyint, [b].[Bool]) = CAST(1 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE CBYTE(`b`.`Bool` * -1) = CBYTE(1)
 """,
                 //
                 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE CONVERT(tinyint, [b].[Byte]) = CAST(8 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE CBYTE(`b`.`Byte`) = CBYTE(8)
 """,
                 //
                 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE [b].[Decimal] >= 0.0 AND [b].[Decimal] <= 255.0 AND CONVERT(tinyint, [b].[Decimal]) = CAST(12 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE `b`.`Decimal` >= 0.0 AND `b`.`Decimal` <= 255.0 AND CBYTE(`b`.`Decimal`) = CBYTE(12)
 """,
                 //
                 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE [b].[Double] >= 0.0E0 AND [b].[Double] <= 255.0E0 AND CONVERT(tinyint, [b].[Double]) = CAST(12 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE `b`.`Double` >= 0.0 AND `b`.`Double` <= 255.0 AND CBYTE(`b`.`Double`) = CBYTE(12)
 """,
                 //
                 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE [b].[Float] >= CAST(0 AS real) AND [b].[Float] <= CAST(255 AS real) AND CONVERT(tinyint, [b].[Float]) = CAST(12 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE `b`.`Float` >= 0 AND `b`.`Float` <= 255 AND CBYTE(`b`.`Float`) = CBYTE(12)
 """,
                 //
                 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE [b].[Short] >= CAST(0 AS smallint) AND [b].[Short] <= CAST(255 AS smallint) AND CONVERT(tinyint, [b].[Short]) = CAST(12 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE `b`.`Short` >= 0 AND `b`.`Short` <= 255 AND CBYTE(`b`.`Short`) = CBYTE(12)
 """,
                 //
                 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE [b].[Int] >= 0 AND [b].[Int] <= 255 AND CONVERT(tinyint, [b].[Int]) = CAST(12 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE `b`.`Int` >= 0 AND `b`.`Int` <= 255 AND CBYTE(`b`.`Int`) = CBYTE(12)
 """,
                 //
                 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE [b].[Long] >= CAST(0 AS bigint) AND [b].[Long] <= CAST(255 AS bigint) AND CONVERT(tinyint, [b].[Long]) = CAST(12 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE `b`.`Long` >= 0 AND `b`.`Long` <= 255 AND CBYTE(`b`.`Long`) = CBYTE(12)
 """,
                 //
                 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE [b].[Int] >= 0 AND [b].[Int] <= 255 AND CONVERT(tinyint, CONVERT(nvarchar(max), [b].[Int])) = CAST(12 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE `b`.`Int` >= 0 AND `b`.`Int` <= 255 AND CBYTE((`b`.`Int` & '')) = CBYTE(12)
 """,
                 //
                 """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE [b].[Int] >= 0 AND [b].[Int] <= 255 AND CONVERT(tinyint, [b].[Int]) = CAST(12 AS tinyint)
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE `b`.`Int` >= 0 AND `b`.`Int` <= 255 AND CBYTE(`b`.`Int`) = CBYTE(12)
 """);
     }
 
@@ -278,7 +282,7 @@ public override async Task Convert_ToDouble()
     """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE CDBL(`b`.`Bool`) * -1 = 1.0
+WHERE CDBL(`b`.`Bool` * -1) = 1.0
 """,
     //
     """
@@ -344,7 +348,7 @@ public override async Task Convert_ToInt16()
     """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE CINT(`b`.`Bool`) * -1 = 1
+WHERE CINT(`b`.`Bool` * -1) = 1
 """,
     //
     """
@@ -410,7 +414,7 @@ public override async Task Convert_ToInt32()
     """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE CLNG(`b`.`Bool`) * -1 = 1
+WHERE CLNG(`b`.`Bool` * -1) = 1
 """,
     //
     """
@@ -774,6 +778,35 @@ public override async Task TimeSpan_Compare_to_simple_zero(bool compareTo)
 
     #endregion Compare
 
+
+    [ConditionalFact]
+    public virtual async Task Sum_over_bool()
+    {
+        await AssertSum(
+            async: true,
+            ss => ss.Set<BasicTypesEntity>().Select(o => Convert.ToInt32(o.Bool)));
+
+        AssertSql(
+            """
+SELECT IIF(SUM(CLNG(`b`.`Bool` * -1)) IS NULL, 0, SUM(CLNG(`b`.`Bool` * -1)))
+FROM `BasicTypesEntities` AS `b`
+""");
+    }
+
+    [ConditionalFact]
+    public virtual async Task Sum_over_bool_with_ternary()
+    {
+        await AssertSum(
+            async: true,
+            ss => ss.Set<BasicTypesEntity>().Select(o => o.Bool ? 1 : 0));
+
+        AssertSql(
+            """
+SELECT IIF(SUM(IIF(`b`.`Bool`, 1, 0)) IS NULL, 0, SUM(IIF(`b`.`Bool`, 1, 0)))
+FROM `BasicTypesEntities` AS `b`
+""");
+    }
+
     [ConditionalFact]
     public virtual void Check_all_tests_overridden()
         => TestHelpers.AssertAllMethodsOverridden(GetType());
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Translations/StringTranslationsJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Translations/StringTranslationsJetTest.cs
index 99e38ba1..0ca51885 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/Translations/StringTranslationsJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/Translations/StringTranslationsJetTest.cs
@@ -336,7 +336,7 @@ public override async Task Substring()
             """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE IIF(LEN(`b`.`String`) IS NULL, NULL, CLNG(LEN(`b`.`String`))) >= 3 AND MID(`b`.`String`, 1 + 1, 2) = 'ea'
+WHERE IIF(LEN(`b`.`String`) IS NULL, NULL, CLNG(LEN(`b`.`String`))) >= 3 AND MID(`b`.`String`, IIF(1 = -1, 0, 1) + 1, 2) = 'ea'
 """);
     }
 
@@ -386,7 +386,7 @@ public override async Task Substring_with_two_args_with_zero_startIndex()
             """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE IIF(LEN(`b`.`String`) IS NULL, NULL, CLNG(LEN(`b`.`String`))) >= 3 AND MID(`b`.`String`, 0 + 1, 3) = 'Sea'
+WHERE IIF(LEN(`b`.`String`) IS NULL, NULL, CLNG(LEN(`b`.`String`))) >= 3 AND MID(`b`.`String`, IIF(0 = -1, 0, 0) + 1, 3) = 'Sea'
 """);
     }
 
@@ -398,7 +398,7 @@ public override async Task Substring_with_two_args_with_zero_length()
             """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE IIF(LEN(`b`.`String`) IS NULL, NULL, CLNG(LEN(`b`.`String`))) >= 2 AND MID(`b`.`String`, 2 + 1, 0) = ''
+WHERE IIF(LEN(`b`.`String`) IS NULL, NULL, CLNG(LEN(`b`.`String`))) >= 2 AND MID(`b`.`String`, IIF(2 = -1, 0, 2) + 1, 0) = ''
 """);
     }
 
@@ -409,10 +409,11 @@ public override async Task Substring_with_two_args_with_parameter()
         AssertSql(
             """
 @start='2'
+@start='2'
 
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE IIF(LEN(`b`.`String`) IS NULL, NULL, CLNG(LEN(`b`.`String`))) >= 5 AND MID(`b`.`String`, @start + 1, 3) = 'att'
+WHERE IIF(LEN(`b`.`String`) IS NULL, NULL, CLNG(LEN(`b`.`String`))) >= 5 AND MID(`b`.`String`, IIF(@start = -1, 0, @start) + 1, 3) = 'att'
 """);
     }
 
@@ -422,9 +423,9 @@ public override async Task Substring_with_two_args_with_IndexOf()
 
         AssertSql(
             """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE [b].[String] LIKE N'%a%' AND SUBSTRING([b].[String], (CAST(CHARINDEX(N'a', [b].[String]) AS int) - 1) + 1, 3) = N'att'
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE (`b`.`String` LIKE '%a%') AND MID(`b`.`String`, IIF((INSTR(1, `b`.`String`, 'a', 1) - 1) = -1, 0, INSTR(1, `b`.`String`, 'a', 1) - 1) + 1, 3) = 'att'
 """);
     }
 
@@ -1028,7 +1029,7 @@ public override async Task Compare_nested()
             """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE `b`.`String` <> MID(`b`.`String`, 0 + 1, 0)
+WHERE `b`.`String` <> MID(`b`.`String`, IIF(0 = -1, 0, 0) + 1, 0)
 """,
             //
             """
@@ -1046,7 +1047,7 @@ public override async Task Compare_nested()
             """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE `b`.`String` > MID(`b`.`String`, 0 + 1, 0)
+WHERE `b`.`String` > MID(`b`.`String`, IIF(0 = -1, 0, 0) + 1, 0)
 """,
             //
             """
@@ -1244,7 +1245,7 @@ public override async Task CompareTo_nested()
             """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE `b`.`String` <> MID(`b`.`String`, 0 + 1, 0)
+WHERE `b`.`String` <> MID(`b`.`String`, IIF(0 = -1, 0, 0) + 1, 0)
 """,
             //
             """
@@ -1262,7 +1263,7 @@ public override async Task CompareTo_nested()
             """
 SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
 FROM `BasicTypesEntities` AS `b`
-WHERE `b`.`String` > MID(`b`.`String`, 0 + 1, 0)
+WHERE `b`.`String` > MID(`b`.`String`, IIF(0 = -1, 0, 0) + 1, 0)
 """,
             //
             """
@@ -1372,11 +1373,11 @@ public override async Task Join_non_aggregate()
 
         AssertSql(
             """
-@foo='foo' (Size = 4000)
+@foo='foo' (Size = 255)
 
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE CONCAT_WS(N'|', [b].[String], @foo, N'', N'bar') = N'Seattle|foo||bar'
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE ((((((`b`.`String` & '|') & @foo) & '|') & '') & '|') & 'bar') = 'Seattle|foo||bar'
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsJetTest.cs
index 3de84e3d..f063834f 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsJetTest.cs
@@ -179,9 +179,9 @@ public override async Task ToDateTime_property_with_constant_TimeOnly()
 
         AssertSql(
             """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE DATETIME2FROMPARTS(DATEPART(year, [b].[DateOnly]), DATEPART(month, [b].[DateOnly]), DATEPART(day, [b].[DateOnly]), 21, 5, 19, 9405000, 7) = '2020-01-01T21:05:19.9405000'
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE (DateSerial(DATEPART('yyyy', `b`.`DateOnly`), DATEPART('m', `b`.`DateOnly`), DATEPART('d', `b`.`DateOnly`)) + TimeSerial(21, 5, 19)) = #2020-01-01 21:05:19#
 """);
     }
 
@@ -191,9 +191,9 @@ public override async Task ToDateTime_property_with_property_TimeOnly()
 
         AssertSql(
             """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE DATETIME2FROMPARTS(DATEPART(year, [b].[DateOnly]), DATEPART(month, [b].[DateOnly]), DATEPART(day, [b].[DateOnly]), DATEPART(hour, [b].[TimeOnly]), DATEPART(minute, [b].[TimeOnly]), DATEPART(second, [b].[TimeOnly]), DATEPART(nanosecond, [b].[TimeOnly]) / 100, 7) = '2020-01-01T15:30:10.0000000'
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE (DateSerial(DATEPART('yyyy', `b`.`DateOnly`), DATEPART('m', `b`.`DateOnly`), DATEPART('d', `b`.`DateOnly`)) + TimeSerial(DATEPART('h', `b`.`TimeOnly`), DATEPART('n', `b`.`TimeOnly`), DATEPART('s', `b`.`TimeOnly`))) = #2020-01-01 15:30:10#
 """);
     }
 
@@ -203,9 +203,9 @@ public override async Task ToDateTime_constant_DateTime_with_property_TimeOnly()
 
         AssertSql(
             """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE DATETIME2FROMPARTS(1990, 11, 10, DATEPART(hour, [b].[TimeOnly]), DATEPART(minute, [b].[TimeOnly]), DATEPART(second, [b].[TimeOnly]), DATEPART(nanosecond, [b].[TimeOnly]) / 100, 7) = '1990-11-10T15:30:10.0000000'
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE (DateSerial(1990, 11, 10) + TimeSerial(DATEPART('h', `b`.`TimeOnly`), DATEPART('n', `b`.`TimeOnly`), DATEPART('s', `b`.`TimeOnly`))) = #1990-11-10 15:30:10#
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsJetTest.cs
index fd9618d9..a7e24513 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsJetTest.cs
@@ -110,9 +110,9 @@ public override async Task Hour()
 
         AssertSql(
             """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE DATEPART(hour, [b].[DateTimeOffset]) = 15
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE DATEPART('h', `b`.`DateTimeOffset`) = 15
 """);
     }
 
@@ -122,9 +122,9 @@ public override async Task Minute()
 
         AssertSql(
             """
-SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
-FROM [BasicTypesEntities] AS [b]
-WHERE DATEPART(minute, [b].[DateTimeOffset]) = 30
+SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
+FROM `BasicTypesEntities` AS `b`
+WHERE DATEPART('n', `b`.`DateTimeOffset`) = 30
 """);
     }
 
@@ -182,8 +182,8 @@ public override async Task TimeOfDay()
 
         AssertSql(
             """
-SELECT CONVERT(time, [b].[DateTimeOffset])
-FROM [BasicTypesEntities] AS [b]
+SELECT TIMEVALUE(`b`.`DateTimeOffset`)
+FROM `BasicTypesEntities` AS `b`
 """);
     }
 
@@ -253,14 +253,15 @@ SELECT DATEADD('s', 1.0, `b`.`DateTimeOffset`)
 """);
     }
 
+    //Note: AddMilliseconds is unsupported but the shape of this has the column top-level and ef core falls back to client-side
     public override async Task AddMilliseconds()
     {
         await base.AddMilliseconds();
 
         AssertSql(
             """
-SELECT DATEADD(millisecond, CAST(300.0E0 AS int), [b].[DateTimeOffset])
-FROM [BasicTypesEntities] AS [b]
+SELECT `b`.`DateTimeOffset`
+FROM `BasicTypesEntities` AS `b`
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs
new file mode 100644
index 00000000..22893740
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs
@@ -0,0 +1,2930 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Update.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 8)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var dependentBase = DependentBaseEntityType.Create(this);
+            var manyTypes = ManyTypesEntityType.Create(this);
+            var principalBase = PrincipalBaseEntityType.Create(this);
+            var ownedType = OwnedTypeEntityType.Create(this);
+            var ownedType0 = OwnedType0EntityType.Create(this);
+            var principalBasePrincipalDerivedDependentBasebyte = PrincipalBasePrincipalDerivedDependentBasebyteEntityType.Create(this);
+            var dependentDerived = DependentDerivedEntityType.Create(this, dependentBase);
+            var principalDerived = PrincipalDerivedEntityType.Create(this, principalBase);
+
+            DependentBaseEntityType.CreateForeignKey1(dependentBase, principalBase);
+            DependentBaseEntityType.CreateForeignKey2(dependentBase, principalDerived);
+            OwnedTypeEntityType.CreateForeignKey1(ownedType, principalBase);
+            OwnedTypeEntityType.CreateForeignKey2(ownedType, ownedType);
+            OwnedType0EntityType.CreateForeignKey1(ownedType0, principalDerived);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateForeignKey1(principalBasePrincipalDerivedDependentBasebyte, principalDerived);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateForeignKey2(principalBasePrincipalDerivedDependentBasebyte, principalBase);
+            PrincipalDerivedEntityType.CreateForeignKey1(principalDerived, principalBase);
+
+            PrincipalBaseEntityType.CreateSkipNavigation1(principalBase, principalDerived, principalBasePrincipalDerivedDependentBasebyte);
+            PrincipalDerivedEntityType.CreateSkipNavigation1(principalDerived, principalBase, principalBasePrincipalDerivedDependentBasebyte);
+
+            DependentBaseEntityType.CreateAnnotations(dependentBase);
+            ManyTypesEntityType.CreateAnnotations(manyTypes);
+            PrincipalBaseEntityType.CreateAnnotations(principalBase);
+            OwnedTypeEntityType.CreateAnnotations(ownedType);
+            OwnedType0EntityType.CreateAnnotations(ownedType0);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateAnnotations(principalBasePrincipalDerivedDependentBasebyte);
+            DependentDerivedEntityType.CreateAnnotations(dependentDerived);
+            PrincipalDerivedEntityType.CreateAnnotations(principalDerived);
+
+            AddAnnotation("Jet:IdentityIncrement", 2);
+            AddAnnotation("Jet:IdentitySeed", 3);
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var dependentBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            dependentBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", null, relationalModel);
+            var dataColumnBase = new ColumnBase<ColumnMappingBase>("Data", "char(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Data", dataColumnBase);
+            var enumDiscriminatorColumnBase = new ColumnBase<ColumnMappingBase>("EnumDiscriminator", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("EnumDiscriminator", enumDiscriminatorColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Id", idColumnBase);
+            var moneyColumnBase = new ColumnBase<ColumnMappingBase>("Money", "decimal(9,3)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Money", moneyColumnBase);
+            var principalAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalAlternateId", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalAlternateId", principalAlternateIdColumnBase);
+            var principalIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalId", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalId", principalIdColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(dependentBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalAlternateIdColumnBase, dependentBase.FindProperty("PrincipalAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalIdColumnBase, dependentBase.FindProperty("PrincipalId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumDiscriminatorColumnBase, dependentBase.FindProperty("EnumDiscriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, dependentBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            dependentBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dependentBasebyteTable = new Table("DependentBase<byte?>", null, relationalModel);
+            var principalIdColumn = new Column("PrincipalId", "integer", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("PrincipalId", principalIdColumn);
+            principalIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(principalIdColumn);
+            var principalAlternateIdColumn = new Column("PrincipalAlternateId", "uniqueidentifier", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("PrincipalAlternateId", principalAlternateIdColumn);
+            principalAlternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(principalAlternateIdColumn);
+            var dataColumn = new Column("Data", "char(20)", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("Data", dataColumn);
+            dataColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dataColumn);
+            var enumDiscriminatorColumn = new Column("EnumDiscriminator", "integer", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("EnumDiscriminator", enumDiscriminatorColumn);
+            enumDiscriminatorColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enumDiscriminatorColumn);
+            var idColumn = new Column("Id", "byte", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("Id", idColumn);
+            idColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(idColumn);
+            var moneyColumn = new Column("Money", "decimal(9,3)", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("Money", moneyColumn);
+            moneyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(moneyColumn);
+            relationalModel.Tables.Add(("DependentBase<byte?>", null), dependentBasebyteTable);
+            var dependentBasebyteTableMapping = new TableMapping(dependentBase, dependentBasebyteTable, true)
+            {
+                IsSharedTablePrincipal = true,
+            };
+            dependentBasebyteTable.AddTypeMapping(dependentBasebyteTableMapping, false);
+            tableMappings.Add(dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalAlternateIdColumn, dependentBase.FindProperty("PrincipalAlternateId")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalIdColumn, dependentBase.FindProperty("PrincipalId")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(enumDiscriminatorColumn, dependentBase.FindProperty("EnumDiscriminator")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, dependentBase.FindProperty("Id")!, dependentBasebyteTableMapping);
+
+            var dependentDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<byte?>")!;
+
+            var defaultTableMappings0 = new List<TableMappingBase<ColumnMappingBase>>();
+            dependentDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0 = new TableMappingBase<ColumnMappingBase>(dependentDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0, false);
+            defaultTableMappings0.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalAlternateIdColumnBase, dependentDerived.FindProperty("PrincipalAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalIdColumnBase, dependentDerived.FindProperty("PrincipalId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dataColumnBase, dependentDerived.FindProperty("Data")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumDiscriminatorColumnBase, dependentDerived.FindProperty("EnumDiscriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, dependentDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)moneyColumnBase, dependentDerived.FindProperty("Money")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+
+            var tableMappings0 = new List<TableMapping>();
+            dependentDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings0);
+            var dependentBasebyteTableMapping0 = new TableMapping(dependentDerived, dependentBasebyteTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            dependentBasebyteTable.AddTypeMapping(dependentBasebyteTableMapping0, false);
+            tableMappings0.Add(dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(principalAlternateIdColumn, dependentDerived.FindProperty("PrincipalAlternateId")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(principalIdColumn, dependentDerived.FindProperty("PrincipalId")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(dataColumn, dependentDerived.FindProperty("Data")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(enumDiscriminatorColumn, dependentDerived.FindProperty("EnumDiscriminator")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(idColumn, dependentDerived.FindProperty("Id")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(moneyColumn, dependentDerived.FindProperty("Money")!, dependentBasebyteTableMapping0);
+            var pK_DependentBasebyte = new UniqueConstraint("PK_DependentBase<byte?>", dependentBasebyteTable, new[] { principalIdColumn, principalAlternateIdColumn });
+            dependentBasebyteTable.PrimaryKey = pK_DependentBasebyte;
+            pK_DependentBasebyte.SetRowKeyValueFactory(new CompositeRowKeyValueFactory(pK_DependentBasebyte));
+            var pK_DependentBasebyteKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId", "PrincipalAlternateId" });
+            pK_DependentBasebyte.MappedKeys.Add(pK_DependentBasebyteKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DependentBasebyteKey).Add(pK_DependentBasebyte);
+            dependentBasebyteTable.UniqueConstraints.Add("PK_DependentBase<byte?>", pK_DependentBasebyte);
+            var iX_DependentBasebyte_PrincipalId = new TableIndex(
+            "IX_DependentBase<byte?>_PrincipalId", dependentBasebyteTable, new[] { principalIdColumn }, true);
+            iX_DependentBasebyte_PrincipalId.SetRowIndexValueFactory(new SimpleRowIndexValueFactory<int>(iX_DependentBasebyte_PrincipalId));
+            var iX_DependentBasebyte_PrincipalIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" });
+            iX_DependentBasebyte_PrincipalId.MappedIndexes.Add(iX_DependentBasebyte_PrincipalIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_DependentBasebyte_PrincipalIdIx).Add(iX_DependentBasebyte_PrincipalId);
+            dependentBasebyteTable.Indexes.Add("IX_DependentBase<byte?>_PrincipalId", iX_DependentBasebyte_PrincipalId);
+
+            var manyTypes = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes")!;
+
+            var defaultTableMappings1 = new List<TableMappingBase<ColumnMappingBase>>();
+            manyTypes.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings1);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes", null, relationalModel);
+            var boolColumnBase = new ColumnBase<ColumnMappingBase>("Bool", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Bool", boolColumnBase);
+            var boolArrayColumnBase = new ColumnBase<ColumnMappingBase>("BoolArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolArray", boolArrayColumnBase);
+            var boolReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("BoolReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolReadOnlyCollection", boolReadOnlyCollectionColumnBase);
+            var boolToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BoolToStringConverterProperty", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolToStringConverterProperty", boolToStringConverterPropertyColumnBase);
+            var boolToTwoValuesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BoolToTwoValuesConverterProperty", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolToTwoValuesConverterProperty", boolToTwoValuesConverterPropertyColumnBase);
+            var boolToZeroOneConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BoolToZeroOneConverterProperty", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolToZeroOneConverterProperty", boolToZeroOneConverterPropertyColumnBase);
+            var bytesColumnBase = new ColumnBase<ColumnMappingBase>("Bytes", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Bytes", bytesColumnBase);
+            var bytesArrayColumnBase = new ColumnBase<ColumnMappingBase>("BytesArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BytesArray", bytesArrayColumnBase);
+            var bytesToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BytesToStringConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BytesToStringConverterProperty", bytesToStringConverterPropertyColumnBase);
+            var castingConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("CastingConverterProperty", "decimal(18,2)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CastingConverterProperty", castingConverterPropertyColumnBase);
+            var charColumnBase = new ColumnBase<ColumnMappingBase>("Char", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Char", charColumnBase);
+            var charArrayColumnBase = new ColumnBase<ColumnMappingBase>("CharArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharArray", charArrayColumnBase);
+            var charToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("CharToStringConverterProperty", "char(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumnBase);
+            var dateOnlyColumnBase = new ColumnBase<ColumnMappingBase>("DateOnly", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnly", dateOnlyColumnBase);
+            var dateOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("DateOnlyArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnlyArray", dateOnlyArrayColumnBase);
+            var dateOnlyToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateOnlyToStringConverterProperty", "varchar(10)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnlyToStringConverterProperty", dateOnlyToStringConverterPropertyColumnBase);
+            var dateTimeColumnBase = new ColumnBase<ColumnMappingBase>("DateTime", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTime", dateTimeColumnBase);
+            var dateTimeArrayColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeArray", dateTimeArrayColumnBase);
+            var dateTimeOffsetToBinaryConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeOffsetToBinaryConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeOffsetToBinaryConverterProperty", dateTimeOffsetToBinaryConverterPropertyColumnBase);
+            var dateTimeOffsetToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeOffsetToBytesConverterProperty", "varbinary(12)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeOffsetToBytesConverterProperty", dateTimeOffsetToBytesConverterPropertyColumnBase);
+            var dateTimeOffsetToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeOffsetToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeOffsetToStringConverterProperty", dateTimeOffsetToStringConverterPropertyColumnBase);
+            var dateTimeToBinaryConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeToBinaryConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeToBinaryConverterProperty", dateTimeToBinaryConverterPropertyColumnBase);
+            var dateTimeToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeToStringConverterProperty", dateTimeToStringConverterPropertyColumnBase);
+            var dateTimeToTicksConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeToTicksConverterProperty", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeToTicksConverterProperty", dateTimeToTicksConverterPropertyColumnBase);
+            var decimalColumnBase = new ColumnBase<ColumnMappingBase>("Decimal", "decimal(18,2)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Decimal", decimalColumnBase);
+            var decimalArrayColumnBase = new ColumnBase<ColumnMappingBase>("DecimalArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DecimalArray", decimalArrayColumnBase);
+            var decimalNumberToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DecimalNumberToBytesConverterProperty", "varbinary(16)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DecimalNumberToBytesConverterProperty", decimalNumberToBytesConverterPropertyColumnBase);
+            var decimalNumberToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DecimalNumberToStringConverterProperty", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DecimalNumberToStringConverterProperty", decimalNumberToStringConverterPropertyColumnBase);
+            var doubleColumnBase = new ColumnBase<ColumnMappingBase>("Double", "double", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Double", doubleColumnBase);
+            var doubleArrayColumnBase = new ColumnBase<ColumnMappingBase>("DoubleArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DoubleArray", doubleArrayColumnBase);
+            var doubleNumberToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DoubleNumberToBytesConverterProperty", "varbinary(8)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DoubleNumberToBytesConverterProperty", doubleNumberToBytesConverterPropertyColumnBase);
+            var doubleNumberToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DoubleNumberToStringConverterProperty", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DoubleNumberToStringConverterProperty", doubleNumberToStringConverterPropertyColumnBase);
+            var enum16ColumnBase = new ColumnBase<ColumnMappingBase>("Enum16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16", enum16ColumnBase);
+            var enum16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16Array", enum16ArrayColumnBase);
+            var enum16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum16AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16AsString", enum16AsStringColumnBase);
+            var enum16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum16AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16AsStringArray", enum16AsStringArrayColumnBase);
+            var enum16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum16AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16AsStringCollection", enum16AsStringCollectionColumnBase);
+            var enum16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum16Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16Collection", enum16CollectionColumnBase);
+            var enum32ColumnBase = new ColumnBase<ColumnMappingBase>("Enum32", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32", enum32ColumnBase);
+            var enum32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32Array", enum32ArrayColumnBase);
+            var enum32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum32AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32AsString", enum32AsStringColumnBase);
+            var enum32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum32AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32AsStringArray", enum32AsStringArrayColumnBase);
+            var enum32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum32AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32AsStringCollection", enum32AsStringCollectionColumnBase);
+            var enum32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum32Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32Collection", enum32CollectionColumnBase);
+            var enum64ColumnBase = new ColumnBase<ColumnMappingBase>("Enum64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64", enum64ColumnBase);
+            var enum64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64Array", enum64ArrayColumnBase);
+            var enum64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum64AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64AsString", enum64AsStringColumnBase);
+            var enum64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum64AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64AsStringArray", enum64AsStringArrayColumnBase);
+            var enum64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum64AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64AsStringCollection", enum64AsStringCollectionColumnBase);
+            var enum64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum64Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64Collection", enum64CollectionColumnBase);
+            var enum8ColumnBase = new ColumnBase<ColumnMappingBase>("Enum8", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8", enum8ColumnBase);
+            var enum8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8Array", enum8ArrayColumnBase);
+            var enum8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum8AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8AsString", enum8AsStringColumnBase);
+            var enum8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum8AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8AsStringArray", enum8AsStringArrayColumnBase);
+            var enum8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum8AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8AsStringCollection", enum8AsStringCollectionColumnBase);
+            var enum8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum8Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8Collection", enum8CollectionColumnBase);
+            var enumToNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("EnumToNumberConverterProperty", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumToNumberConverterProperty", enumToNumberConverterPropertyColumnBase);
+            var enumToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("EnumToStringConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumToStringConverterProperty", enumToStringConverterPropertyColumnBase);
+            var enumU16ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16", enumU16ColumnBase);
+            var enumU16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16Array", enumU16ArrayColumnBase);
+            var enumU16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16AsString", enumU16AsStringColumnBase);
+            var enumU16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16AsStringArray", enumU16AsStringArrayColumnBase);
+            var enumU16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16AsStringCollection", enumU16AsStringCollectionColumnBase);
+            var enumU16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16Collection", enumU16CollectionColumnBase);
+            var enumU32ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32", enumU32ColumnBase);
+            var enumU32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32Array", enumU32ArrayColumnBase);
+            var enumU32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32AsString", enumU32AsStringColumnBase);
+            var enumU32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32AsStringArray", enumU32AsStringArrayColumnBase);
+            var enumU32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32AsStringCollection", enumU32AsStringCollectionColumnBase);
+            var enumU32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32Collection", enumU32CollectionColumnBase);
+            var enumU64ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64", enumU64ColumnBase);
+            var enumU64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64Array", enumU64ArrayColumnBase);
+            var enumU64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64AsString", enumU64AsStringColumnBase);
+            var enumU64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64AsStringArray", enumU64AsStringArrayColumnBase);
+            var enumU64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64AsStringCollection", enumU64AsStringCollectionColumnBase);
+            var enumU64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64Collection", enumU64CollectionColumnBase);
+            var enumU8ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8", enumU8ColumnBase);
+            var enumU8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8Array", enumU8ArrayColumnBase);
+            var enumU8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8AsString", enumU8AsStringColumnBase);
+            var enumU8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8AsStringArray", enumU8AsStringArrayColumnBase);
+            var enumU8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8AsStringCollection", enumU8AsStringCollectionColumnBase);
+            var enumU8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8Collection", enumU8CollectionColumnBase);
+            var floatColumnBase = new ColumnBase<ColumnMappingBase>("Float", "single", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Float", floatColumnBase);
+            var floatArrayColumnBase = new ColumnBase<ColumnMappingBase>("FloatArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("FloatArray", floatArrayColumnBase);
+            var guidColumnBase = new ColumnBase<ColumnMappingBase>("Guid", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Guid", guidColumnBase);
+            var guidArrayColumnBase = new ColumnBase<ColumnMappingBase>("GuidArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("GuidArray", guidArrayColumnBase);
+            var guidToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("GuidToBytesConverterProperty", "varbinary(16)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("GuidToBytesConverterProperty", guidToBytesConverterPropertyColumnBase);
+            var guidToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("GuidToStringConverterProperty", "varchar(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("GuidToStringConverterProperty", guidToStringConverterPropertyColumnBase);
+            var iPAddressColumnBase = new ColumnBase<ColumnMappingBase>("IPAddress", "varchar(45)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddress", iPAddressColumnBase);
+            var iPAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressArray", iPAddressArrayColumnBase);
+            var iPAddressReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressReadOnlyCollection", iPAddressReadOnlyCollectionColumnBase);
+            var iPAddressToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressToBytesConverterProperty", "varbinary(16)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressToBytesConverterProperty", iPAddressToBytesConverterPropertyColumnBase);
+            var iPAddressToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressToStringConverterProperty", "varchar(45)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressToStringConverterProperty", iPAddressToStringConverterPropertyColumnBase);
+            var idColumnBase0 = new ColumnBase<ColumnMappingBase>("Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Id", idColumnBase0);
+            var int16ColumnBase = new ColumnBase<ColumnMappingBase>("Int16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int16", int16ColumnBase);
+            var int16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int16Array", int16ArrayColumnBase);
+            var int32ColumnBase = new ColumnBase<ColumnMappingBase>("Int32", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int32", int32ColumnBase);
+            var int32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int32Array", int32ArrayColumnBase);
+            var int32ReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Int32ReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int32ReadOnlyCollection", int32ReadOnlyCollectionColumnBase);
+            var int64ColumnBase = new ColumnBase<ColumnMappingBase>("Int64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int64", int64ColumnBase);
+            var int64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int64Array", int64ArrayColumnBase);
+            var int8ColumnBase = new ColumnBase<ColumnMappingBase>("Int8", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int8", int8ColumnBase);
+            var int8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int8Array", int8ArrayColumnBase);
+            var intNumberToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IntNumberToBytesConverterProperty", "varbinary(4)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IntNumberToBytesConverterProperty", intNumberToBytesConverterPropertyColumnBase);
+            var intNumberToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IntNumberToStringConverterProperty", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IntNumberToStringConverterProperty", intNumberToStringConverterPropertyColumnBase);
+            var nullIntToNullStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("NullIntToNullStringConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullIntToNullStringConverterProperty", nullIntToNullStringConverterPropertyColumnBase);
+            var nullableBoolColumnBase = new ColumnBase<ColumnMappingBase>("NullableBool", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBool", nullableBoolColumnBase);
+            var nullableBoolArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableBoolArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBoolArray", nullableBoolArrayColumnBase);
+            var nullableBytesColumnBase = new ColumnBase<ColumnMappingBase>("NullableBytes", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBytes", nullableBytesColumnBase);
+            var nullableBytesArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableBytesArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBytesArray", nullableBytesArrayColumnBase);
+            var nullableCharColumnBase = new ColumnBase<ColumnMappingBase>("NullableChar", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableChar", nullableCharColumnBase);
+            var nullableCharArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableCharArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableCharArray", nullableCharArrayColumnBase);
+            var nullableDateOnlyColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateOnly", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateOnly", nullableDateOnlyColumnBase);
+            var nullableDateOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateOnlyArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateOnlyArray", nullableDateOnlyArrayColumnBase);
+            var nullableDateTimeColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateTime", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateTime", nullableDateTimeColumnBase);
+            var nullableDateTimeArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateTimeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateTimeArray", nullableDateTimeArrayColumnBase);
+            var nullableDecimalColumnBase = new ColumnBase<ColumnMappingBase>("NullableDecimal", "decimal(18,2)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDecimal", nullableDecimalColumnBase);
+            var nullableDecimalArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDecimalArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDecimalArray", nullableDecimalArrayColumnBase);
+            var nullableDoubleColumnBase = new ColumnBase<ColumnMappingBase>("NullableDouble", "double", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDouble", nullableDoubleColumnBase);
+            var nullableDoubleArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDoubleArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDoubleArray", nullableDoubleArrayColumnBase);
+            var nullableEnum16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16", nullableEnum16ColumnBase);
+            var nullableEnum16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16Array", nullableEnum16ArrayColumnBase);
+            var nullableEnum16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16AsString", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16AsString", nullableEnum16AsStringColumnBase);
+            var nullableEnum16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16AsStringArray", nullableEnum16AsStringArrayColumnBase);
+            var nullableEnum16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16AsStringCollection", nullableEnum16AsStringCollectionColumnBase);
+            var nullableEnum16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16Collection", nullableEnum16CollectionColumnBase);
+            var nullableEnum32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32", nullableEnum32ColumnBase);
+            var nullableEnum32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32Array", nullableEnum32ArrayColumnBase);
+            var nullableEnum32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32AsString", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32AsString", nullableEnum32AsStringColumnBase);
+            var nullableEnum32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32AsStringArray", nullableEnum32AsStringArrayColumnBase);
+            var nullableEnum32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32AsStringCollection", nullableEnum32AsStringCollectionColumnBase);
+            var nullableEnum32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32Collection", nullableEnum32CollectionColumnBase);
+            var nullableEnum64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64", nullableEnum64ColumnBase);
+            var nullableEnum64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64Array", nullableEnum64ArrayColumnBase);
+            var nullableEnum64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64AsString", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64AsString", nullableEnum64AsStringColumnBase);
+            var nullableEnum64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64AsStringArray", nullableEnum64AsStringArrayColumnBase);
+            var nullableEnum64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64AsStringCollection", nullableEnum64AsStringCollectionColumnBase);
+            var nullableEnum64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64Collection", nullableEnum64CollectionColumnBase);
+            var nullableEnum8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8", nullableEnum8ColumnBase);
+            var nullableEnum8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8Array", nullableEnum8ArrayColumnBase);
+            var nullableEnum8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8AsString", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8AsString", nullableEnum8AsStringColumnBase);
+            var nullableEnum8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8AsStringArray", nullableEnum8AsStringArrayColumnBase);
+            var nullableEnum8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8AsStringCollection", nullableEnum8AsStringCollectionColumnBase);
+            var nullableEnum8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8Collection", nullableEnum8CollectionColumnBase);
+            var nullableEnumU16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16", nullableEnumU16ColumnBase);
+            var nullableEnumU16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16Array", nullableEnumU16ArrayColumnBase);
+            var nullableEnumU16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16AsString", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16AsString", nullableEnumU16AsStringColumnBase);
+            var nullableEnumU16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16AsStringArray", nullableEnumU16AsStringArrayColumnBase);
+            var nullableEnumU16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16AsStringCollection", nullableEnumU16AsStringCollectionColumnBase);
+            var nullableEnumU16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16Collection", nullableEnumU16CollectionColumnBase);
+            var nullableEnumU32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32", nullableEnumU32ColumnBase);
+            var nullableEnumU32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32Array", nullableEnumU32ArrayColumnBase);
+            var nullableEnumU32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32AsString", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32AsString", nullableEnumU32AsStringColumnBase);
+            var nullableEnumU32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32AsStringArray", nullableEnumU32AsStringArrayColumnBase);
+            var nullableEnumU32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32AsStringCollection", nullableEnumU32AsStringCollectionColumnBase);
+            var nullableEnumU32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32Collection", nullableEnumU32CollectionColumnBase);
+            var nullableEnumU64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64", nullableEnumU64ColumnBase);
+            var nullableEnumU64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64Array", nullableEnumU64ArrayColumnBase);
+            var nullableEnumU64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64AsString", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64AsString", nullableEnumU64AsStringColumnBase);
+            var nullableEnumU64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64AsStringArray", nullableEnumU64AsStringArrayColumnBase);
+            var nullableEnumU64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64AsStringCollection", nullableEnumU64AsStringCollectionColumnBase);
+            var nullableEnumU64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64Collection", nullableEnumU64CollectionColumnBase);
+            var nullableEnumU8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8", nullableEnumU8ColumnBase);
+            var nullableEnumU8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8Array", nullableEnumU8ArrayColumnBase);
+            var nullableEnumU8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8AsString", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8AsString", nullableEnumU8AsStringColumnBase);
+            var nullableEnumU8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8AsStringArray", nullableEnumU8AsStringArrayColumnBase);
+            var nullableEnumU8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8AsStringCollection", nullableEnumU8AsStringCollectionColumnBase);
+            var nullableEnumU8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8Collection", nullableEnumU8CollectionColumnBase);
+            var nullableFloatColumnBase = new ColumnBase<ColumnMappingBase>("NullableFloat", "single", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableFloat", nullableFloatColumnBase);
+            var nullableFloatArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableFloatArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableFloatArray", nullableFloatArrayColumnBase);
+            var nullableGuidColumnBase = new ColumnBase<ColumnMappingBase>("NullableGuid", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableGuid", nullableGuidColumnBase);
+            var nullableGuidArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableGuidArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableGuidArray", nullableGuidArrayColumnBase);
+            var nullableIPAddressColumnBase = new ColumnBase<ColumnMappingBase>("NullableIPAddress", "varchar(45)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableIPAddress", nullableIPAddressColumnBase);
+            var nullableIPAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableIPAddressArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableIPAddressArray", nullableIPAddressArrayColumnBase);
+            var nullableInt16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt16", nullableInt16ColumnBase);
+            var nullableInt16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt16Array", nullableInt16ArrayColumnBase);
+            var nullableInt32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt32", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt32", nullableInt32ColumnBase);
+            var nullableInt32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt32Array", nullableInt32ArrayColumnBase);
+            var nullableInt64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt64", nullableInt64ColumnBase);
+            var nullableInt64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt64Array", nullableInt64ArrayColumnBase);
+            var nullableInt8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt8", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt8", nullableInt8ColumnBase);
+            var nullableInt8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt8Array", nullableInt8ArrayColumnBase);
+            var nullablePhysicalAddressColumnBase = new ColumnBase<ColumnMappingBase>("NullablePhysicalAddress", "varchar(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullablePhysicalAddress", nullablePhysicalAddressColumnBase);
+            var nullablePhysicalAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullablePhysicalAddressArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullablePhysicalAddressArray", nullablePhysicalAddressArrayColumnBase);
+            var nullableStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableString", nullableStringColumnBase);
+            var nullableStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableStringArray", nullableStringArrayColumnBase);
+            var nullableTimeOnlyColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeOnly", "time", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeOnly", nullableTimeOnlyColumnBase);
+            var nullableTimeOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeOnlyArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeOnlyArray", nullableTimeOnlyArrayColumnBase);
+            var nullableTimeSpanColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeSpan", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeSpan", nullableTimeSpanColumnBase);
+            var nullableTimeSpanArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeSpanArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeSpanArray", nullableTimeSpanArrayColumnBase);
+            var nullableUInt16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt16", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt16", nullableUInt16ColumnBase);
+            var nullableUInt16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt16Array", nullableUInt16ArrayColumnBase);
+            var nullableUInt32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt32", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt32", nullableUInt32ColumnBase);
+            var nullableUInt32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt32Array", nullableUInt32ArrayColumnBase);
+            var nullableUInt64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt64", nullableUInt64ColumnBase);
+            var nullableUInt64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt64Array", nullableUInt64ArrayColumnBase);
+            var nullableUInt8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt8", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt8", nullableUInt8ColumnBase);
+            var nullableUInt8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt8Array", nullableUInt8ArrayColumnBase);
+            var nullableUriColumnBase = new ColumnBase<ColumnMappingBase>("NullableUri", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUri", nullableUriColumnBase);
+            var nullableUriArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUriArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUriArray", nullableUriArrayColumnBase);
+            var physicalAddressColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddress", "varchar(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddress", physicalAddressColumnBase);
+            var physicalAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddressArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddressArray", physicalAddressArrayColumnBase);
+            var physicalAddressToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddressToBytesConverterProperty", "varbinary(8)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddressToBytesConverterProperty", physicalAddressToBytesConverterPropertyColumnBase);
+            var physicalAddressToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddressToStringConverterProperty", "varchar(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddressToStringConverterProperty", physicalAddressToStringConverterPropertyColumnBase);
+            var stringColumnBase = new ColumnBase<ColumnMappingBase>("String", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("String", stringColumnBase);
+            var stringArrayColumnBase = new ColumnBase<ColumnMappingBase>("StringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringArray", stringArrayColumnBase);
+            var stringReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("StringReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringReadOnlyCollection", stringReadOnlyCollectionColumnBase);
+            var stringToBoolConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToBoolConverterProperty", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToBoolConverterProperty", stringToBoolConverterPropertyColumnBase);
+            var stringToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToBytesConverterProperty", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToBytesConverterProperty", stringToBytesConverterPropertyColumnBase);
+            var stringToCharConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToCharConverterProperty", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToCharConverterProperty", stringToCharConverterPropertyColumnBase);
+            var stringToDateOnlyConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDateOnlyConverterProperty", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDateOnlyConverterProperty", stringToDateOnlyConverterPropertyColumnBase);
+            var stringToDateTimeConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDateTimeConverterProperty", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDateTimeConverterProperty", stringToDateTimeConverterPropertyColumnBase);
+            var stringToDateTimeOffsetConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDateTimeOffsetConverterProperty", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDateTimeOffsetConverterProperty", stringToDateTimeOffsetConverterPropertyColumnBase);
+            var stringToDecimalNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDecimalNumberConverterProperty", "decimal(18,2)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDecimalNumberConverterProperty", stringToDecimalNumberConverterPropertyColumnBase);
+            var stringToDoubleNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDoubleNumberConverterProperty", "double", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDoubleNumberConverterProperty", stringToDoubleNumberConverterPropertyColumnBase);
+            var stringToEnumConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToEnumConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToEnumConverterProperty", stringToEnumConverterPropertyColumnBase);
+            var stringToGuidConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToGuidConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToGuidConverterProperty", stringToGuidConverterPropertyColumnBase);
+            var stringToIntNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToIntNumberConverterProperty", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToIntNumberConverterProperty", stringToIntNumberConverterPropertyColumnBase);
+            var stringToTimeOnlyConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToTimeOnlyConverterProperty", "time", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToTimeOnlyConverterProperty", stringToTimeOnlyConverterPropertyColumnBase);
+            var stringToTimeSpanConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToTimeSpanConverterProperty", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToTimeSpanConverterProperty", stringToTimeSpanConverterPropertyColumnBase);
+            var stringToUriConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToUriConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToUriConverterProperty", stringToUriConverterPropertyColumnBase);
+            var timeOnlyColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnly", "time", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnly", timeOnlyColumnBase);
+            var timeOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnlyArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnlyArray", timeOnlyArrayColumnBase);
+            var timeOnlyToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnlyToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnlyToStringConverterProperty", timeOnlyToStringConverterPropertyColumnBase);
+            var timeOnlyToTicksConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnlyToTicksConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnlyToTicksConverterProperty", timeOnlyToTicksConverterPropertyColumnBase);
+            var timeSpanColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpan", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpan", timeSpanColumnBase);
+            var timeSpanArrayColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpanArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpanArray", timeSpanArrayColumnBase);
+            var timeSpanToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpanToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpanToStringConverterProperty", timeSpanToStringConverterPropertyColumnBase);
+            var timeSpanToTicksConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpanToTicksConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpanToTicksConverterProperty", timeSpanToTicksConverterPropertyColumnBase);
+            var uInt16ColumnBase = new ColumnBase<ColumnMappingBase>("UInt16", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt16", uInt16ColumnBase);
+            var uInt16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt16Array", uInt16ArrayColumnBase);
+            var uInt32ColumnBase = new ColumnBase<ColumnMappingBase>("UInt32", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt32", uInt32ColumnBase);
+            var uInt32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt32Array", uInt32ArrayColumnBase);
+            var uInt64ColumnBase = new ColumnBase<ColumnMappingBase>("UInt64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt64", uInt64ColumnBase);
+            var uInt64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt64Array", uInt64ArrayColumnBase);
+            var uInt8ColumnBase = new ColumnBase<ColumnMappingBase>("UInt8", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt8", uInt8ColumnBase);
+            var uInt8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt8Array", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt8Array", uInt8ArrayColumnBase);
+            var uInt8ReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("UInt8ReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt8ReadOnlyCollection", uInt8ReadOnlyCollectionColumnBase);
+            var uriColumnBase = new ColumnBase<ColumnMappingBase>("Uri", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Uri", uriColumnBase);
+            var uriArrayColumnBase = new ColumnBase<ColumnMappingBase>("UriArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UriArray", uriArrayColumnBase);
+            var uriToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("UriToStringConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UriToStringConverterProperty", uriToStringConverterPropertyColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase = new TableMappingBase<ColumnMappingBase>(manyTypes, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase, false);
+            defaultTableMappings1.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase0, manyTypes.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolColumnBase, manyTypes.FindProperty("Bool")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolArrayColumnBase, manyTypes.FindProperty("BoolArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolReadOnlyCollectionColumnBase, manyTypes.FindProperty("BoolReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolToStringConverterPropertyColumnBase, manyTypes.FindProperty("BoolToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolToTwoValuesConverterPropertyColumnBase, manyTypes.FindProperty("BoolToTwoValuesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolToZeroOneConverterPropertyColumnBase, manyTypes.FindProperty("BoolToZeroOneConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)bytesColumnBase, manyTypes.FindProperty("Bytes")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)bytesArrayColumnBase, manyTypes.FindProperty("BytesArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)bytesToStringConverterPropertyColumnBase, manyTypes.FindProperty("BytesToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)castingConverterPropertyColumnBase, manyTypes.FindProperty("CastingConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)charColumnBase, manyTypes.FindProperty("Char")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)charArrayColumnBase, manyTypes.FindProperty("CharArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)charToStringConverterPropertyColumnBase, manyTypes.FindProperty("CharToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateOnlyColumnBase, manyTypes.FindProperty("DateOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateOnlyArrayColumnBase, manyTypes.FindProperty("DateOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateOnlyToStringConverterPropertyColumnBase, manyTypes.FindProperty("DateOnlyToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeColumnBase, manyTypes.FindProperty("DateTime")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeArrayColumnBase, manyTypes.FindProperty("DateTimeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeOffsetToBinaryConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeOffsetToBinaryConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeOffsetToBytesConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeOffsetToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeOffsetToStringConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeOffsetToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeToBinaryConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeToBinaryConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeToStringConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeToTicksConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeToTicksConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalColumnBase, manyTypes.FindProperty("Decimal")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalArrayColumnBase, manyTypes.FindProperty("DecimalArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalNumberToBytesConverterPropertyColumnBase, manyTypes.FindProperty("DecimalNumberToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalNumberToStringConverterPropertyColumnBase, manyTypes.FindProperty("DecimalNumberToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleColumnBase, manyTypes.FindProperty("Double")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleArrayColumnBase, manyTypes.FindProperty("DoubleArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleNumberToBytesConverterPropertyColumnBase, manyTypes.FindProperty("DoubleNumberToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleNumberToStringConverterPropertyColumnBase, manyTypes.FindProperty("DoubleNumberToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16ColumnBase, manyTypes.FindProperty("Enum16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16ArrayColumnBase, manyTypes.FindProperty("Enum16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16AsStringColumnBase, manyTypes.FindProperty("Enum16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16AsStringArrayColumnBase, manyTypes.FindProperty("Enum16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16AsStringCollectionColumnBase, manyTypes.FindProperty("Enum16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16CollectionColumnBase, manyTypes.FindProperty("Enum16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32ColumnBase, manyTypes.FindProperty("Enum32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32ArrayColumnBase, manyTypes.FindProperty("Enum32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32AsStringColumnBase, manyTypes.FindProperty("Enum32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32AsStringArrayColumnBase, manyTypes.FindProperty("Enum32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32AsStringCollectionColumnBase, manyTypes.FindProperty("Enum32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32CollectionColumnBase, manyTypes.FindProperty("Enum32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64ColumnBase, manyTypes.FindProperty("Enum64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64ArrayColumnBase, manyTypes.FindProperty("Enum64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64AsStringColumnBase, manyTypes.FindProperty("Enum64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64AsStringArrayColumnBase, manyTypes.FindProperty("Enum64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64AsStringCollectionColumnBase, manyTypes.FindProperty("Enum64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64CollectionColumnBase, manyTypes.FindProperty("Enum64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8ColumnBase, manyTypes.FindProperty("Enum8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8ArrayColumnBase, manyTypes.FindProperty("Enum8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8AsStringColumnBase, manyTypes.FindProperty("Enum8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8AsStringArrayColumnBase, manyTypes.FindProperty("Enum8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8AsStringCollectionColumnBase, manyTypes.FindProperty("Enum8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8CollectionColumnBase, manyTypes.FindProperty("Enum8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumToNumberConverterPropertyColumnBase, manyTypes.FindProperty("EnumToNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumToStringConverterPropertyColumnBase, manyTypes.FindProperty("EnumToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16ColumnBase, manyTypes.FindProperty("EnumU16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16ArrayColumnBase, manyTypes.FindProperty("EnumU16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16AsStringColumnBase, manyTypes.FindProperty("EnumU16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16AsStringArrayColumnBase, manyTypes.FindProperty("EnumU16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16CollectionColumnBase, manyTypes.FindProperty("EnumU16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32ColumnBase, manyTypes.FindProperty("EnumU32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32ArrayColumnBase, manyTypes.FindProperty("EnumU32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32AsStringColumnBase, manyTypes.FindProperty("EnumU32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32AsStringArrayColumnBase, manyTypes.FindProperty("EnumU32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32CollectionColumnBase, manyTypes.FindProperty("EnumU32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64ColumnBase, manyTypes.FindProperty("EnumU64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64ArrayColumnBase, manyTypes.FindProperty("EnumU64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64AsStringColumnBase, manyTypes.FindProperty("EnumU64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64AsStringArrayColumnBase, manyTypes.FindProperty("EnumU64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64CollectionColumnBase, manyTypes.FindProperty("EnumU64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8ColumnBase, manyTypes.FindProperty("EnumU8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8ArrayColumnBase, manyTypes.FindProperty("EnumU8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8AsStringColumnBase, manyTypes.FindProperty("EnumU8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8AsStringArrayColumnBase, manyTypes.FindProperty("EnumU8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8CollectionColumnBase, manyTypes.FindProperty("EnumU8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)floatColumnBase, manyTypes.FindProperty("Float")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)floatArrayColumnBase, manyTypes.FindProperty("FloatArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidColumnBase, manyTypes.FindProperty("Guid")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidArrayColumnBase, manyTypes.FindProperty("GuidArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidToBytesConverterPropertyColumnBase, manyTypes.FindProperty("GuidToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidToStringConverterPropertyColumnBase, manyTypes.FindProperty("GuidToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressColumnBase, manyTypes.FindProperty("IPAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressArrayColumnBase, manyTypes.FindProperty("IPAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressReadOnlyCollectionColumnBase, manyTypes.FindProperty("IPAddressReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressToBytesConverterPropertyColumnBase, manyTypes.FindProperty("IPAddressToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressToStringConverterPropertyColumnBase, manyTypes.FindProperty("IPAddressToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int16ColumnBase, manyTypes.FindProperty("Int16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int16ArrayColumnBase, manyTypes.FindProperty("Int16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int32ColumnBase, manyTypes.FindProperty("Int32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int32ArrayColumnBase, manyTypes.FindProperty("Int32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int32ReadOnlyCollectionColumnBase, manyTypes.FindProperty("Int32ReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int64ColumnBase, manyTypes.FindProperty("Int64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int64ArrayColumnBase, manyTypes.FindProperty("Int64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int8ColumnBase, manyTypes.FindProperty("Int8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int8ArrayColumnBase, manyTypes.FindProperty("Int8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)intNumberToBytesConverterPropertyColumnBase, manyTypes.FindProperty("IntNumberToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)intNumberToStringConverterPropertyColumnBase, manyTypes.FindProperty("IntNumberToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullIntToNullStringConverterPropertyColumnBase, manyTypes.FindProperty("NullIntToNullStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBoolColumnBase, manyTypes.FindProperty("NullableBool")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBoolArrayColumnBase, manyTypes.FindProperty("NullableBoolArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBytesColumnBase, manyTypes.FindProperty("NullableBytes")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBytesArrayColumnBase, manyTypes.FindProperty("NullableBytesArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableCharColumnBase, manyTypes.FindProperty("NullableChar")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableCharArrayColumnBase, manyTypes.FindProperty("NullableCharArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateOnlyColumnBase, manyTypes.FindProperty("NullableDateOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateOnlyArrayColumnBase, manyTypes.FindProperty("NullableDateOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateTimeColumnBase, manyTypes.FindProperty("NullableDateTime")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateTimeArrayColumnBase, manyTypes.FindProperty("NullableDateTimeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDecimalColumnBase, manyTypes.FindProperty("NullableDecimal")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDecimalArrayColumnBase, manyTypes.FindProperty("NullableDecimalArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDoubleColumnBase, manyTypes.FindProperty("NullableDouble")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDoubleArrayColumnBase, manyTypes.FindProperty("NullableDoubleArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16ColumnBase, manyTypes.FindProperty("NullableEnum16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16ArrayColumnBase, manyTypes.FindProperty("NullableEnum16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16AsStringColumnBase, manyTypes.FindProperty("NullableEnum16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16CollectionColumnBase, manyTypes.FindProperty("NullableEnum16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32ColumnBase, manyTypes.FindProperty("NullableEnum32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32ArrayColumnBase, manyTypes.FindProperty("NullableEnum32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32AsStringColumnBase, manyTypes.FindProperty("NullableEnum32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32CollectionColumnBase, manyTypes.FindProperty("NullableEnum32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64ColumnBase, manyTypes.FindProperty("NullableEnum64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64ArrayColumnBase, manyTypes.FindProperty("NullableEnum64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64AsStringColumnBase, manyTypes.FindProperty("NullableEnum64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64CollectionColumnBase, manyTypes.FindProperty("NullableEnum64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8ColumnBase, manyTypes.FindProperty("NullableEnum8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8ArrayColumnBase, manyTypes.FindProperty("NullableEnum8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8AsStringColumnBase, manyTypes.FindProperty("NullableEnum8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8CollectionColumnBase, manyTypes.FindProperty("NullableEnum8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16ColumnBase, manyTypes.FindProperty("NullableEnumU16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16ArrayColumnBase, manyTypes.FindProperty("NullableEnumU16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16AsStringColumnBase, manyTypes.FindProperty("NullableEnumU16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16CollectionColumnBase, manyTypes.FindProperty("NullableEnumU16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32ColumnBase, manyTypes.FindProperty("NullableEnumU32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32ArrayColumnBase, manyTypes.FindProperty("NullableEnumU32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32AsStringColumnBase, manyTypes.FindProperty("NullableEnumU32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32CollectionColumnBase, manyTypes.FindProperty("NullableEnumU32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64ColumnBase, manyTypes.FindProperty("NullableEnumU64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64ArrayColumnBase, manyTypes.FindProperty("NullableEnumU64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64AsStringColumnBase, manyTypes.FindProperty("NullableEnumU64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64CollectionColumnBase, manyTypes.FindProperty("NullableEnumU64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8ColumnBase, manyTypes.FindProperty("NullableEnumU8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8ArrayColumnBase, manyTypes.FindProperty("NullableEnumU8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8AsStringColumnBase, manyTypes.FindProperty("NullableEnumU8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8CollectionColumnBase, manyTypes.FindProperty("NullableEnumU8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableFloatColumnBase, manyTypes.FindProperty("NullableFloat")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableFloatArrayColumnBase, manyTypes.FindProperty("NullableFloatArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableGuidColumnBase, manyTypes.FindProperty("NullableGuid")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableGuidArrayColumnBase, manyTypes.FindProperty("NullableGuidArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableIPAddressColumnBase, manyTypes.FindProperty("NullableIPAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableIPAddressArrayColumnBase, manyTypes.FindProperty("NullableIPAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt16ColumnBase, manyTypes.FindProperty("NullableInt16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt16ArrayColumnBase, manyTypes.FindProperty("NullableInt16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt32ColumnBase, manyTypes.FindProperty("NullableInt32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt32ArrayColumnBase, manyTypes.FindProperty("NullableInt32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt64ColumnBase, manyTypes.FindProperty("NullableInt64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt64ArrayColumnBase, manyTypes.FindProperty("NullableInt64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt8ColumnBase, manyTypes.FindProperty("NullableInt8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt8ArrayColumnBase, manyTypes.FindProperty("NullableInt8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullablePhysicalAddressColumnBase, manyTypes.FindProperty("NullablePhysicalAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullablePhysicalAddressArrayColumnBase, manyTypes.FindProperty("NullablePhysicalAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableStringColumnBase, manyTypes.FindProperty("NullableString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableStringArrayColumnBase, manyTypes.FindProperty("NullableStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeOnlyColumnBase, manyTypes.FindProperty("NullableTimeOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeOnlyArrayColumnBase, manyTypes.FindProperty("NullableTimeOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeSpanColumnBase, manyTypes.FindProperty("NullableTimeSpan")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeSpanArrayColumnBase, manyTypes.FindProperty("NullableTimeSpanArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt16ColumnBase, manyTypes.FindProperty("NullableUInt16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt16ArrayColumnBase, manyTypes.FindProperty("NullableUInt16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt32ColumnBase, manyTypes.FindProperty("NullableUInt32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt32ArrayColumnBase, manyTypes.FindProperty("NullableUInt32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt64ColumnBase, manyTypes.FindProperty("NullableUInt64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt64ArrayColumnBase, manyTypes.FindProperty("NullableUInt64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt8ColumnBase, manyTypes.FindProperty("NullableUInt8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt8ArrayColumnBase, manyTypes.FindProperty("NullableUInt8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUriColumnBase, manyTypes.FindProperty("NullableUri")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUriArrayColumnBase, manyTypes.FindProperty("NullableUriArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressColumnBase, manyTypes.FindProperty("PhysicalAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressArrayColumnBase, manyTypes.FindProperty("PhysicalAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressToBytesConverterPropertyColumnBase, manyTypes.FindProperty("PhysicalAddressToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressToStringConverterPropertyColumnBase, manyTypes.FindProperty("PhysicalAddressToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringColumnBase, manyTypes.FindProperty("String")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringArrayColumnBase, manyTypes.FindProperty("StringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringReadOnlyCollectionColumnBase, manyTypes.FindProperty("StringReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToBoolConverterPropertyColumnBase, manyTypes.FindProperty("StringToBoolConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToBytesConverterPropertyColumnBase, manyTypes.FindProperty("StringToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToCharConverterPropertyColumnBase, manyTypes.FindProperty("StringToCharConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDateOnlyConverterPropertyColumnBase, manyTypes.FindProperty("StringToDateOnlyConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDateTimeConverterPropertyColumnBase, manyTypes.FindProperty("StringToDateTimeConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDateTimeOffsetConverterPropertyColumnBase, manyTypes.FindProperty("StringToDateTimeOffsetConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDecimalNumberConverterPropertyColumnBase, manyTypes.FindProperty("StringToDecimalNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDoubleNumberConverterPropertyColumnBase, manyTypes.FindProperty("StringToDoubleNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToEnumConverterPropertyColumnBase, manyTypes.FindProperty("StringToEnumConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToGuidConverterPropertyColumnBase, manyTypes.FindProperty("StringToGuidConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToIntNumberConverterPropertyColumnBase, manyTypes.FindProperty("StringToIntNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToTimeOnlyConverterPropertyColumnBase, manyTypes.FindProperty("StringToTimeOnlyConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToTimeSpanConverterPropertyColumnBase, manyTypes.FindProperty("StringToTimeSpanConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToUriConverterPropertyColumnBase, manyTypes.FindProperty("StringToUriConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyColumnBase, manyTypes.FindProperty("TimeOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyArrayColumnBase, manyTypes.FindProperty("TimeOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyToStringConverterPropertyColumnBase, manyTypes.FindProperty("TimeOnlyToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyToTicksConverterPropertyColumnBase, manyTypes.FindProperty("TimeOnlyToTicksConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanColumnBase, manyTypes.FindProperty("TimeSpan")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanArrayColumnBase, manyTypes.FindProperty("TimeSpanArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanToStringConverterPropertyColumnBase, manyTypes.FindProperty("TimeSpanToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanToTicksConverterPropertyColumnBase, manyTypes.FindProperty("TimeSpanToTicksConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt16ColumnBase, manyTypes.FindProperty("UInt16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt16ArrayColumnBase, manyTypes.FindProperty("UInt16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt32ColumnBase, manyTypes.FindProperty("UInt32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt32ArrayColumnBase, manyTypes.FindProperty("UInt32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt64ColumnBase, manyTypes.FindProperty("UInt64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt64ArrayColumnBase, manyTypes.FindProperty("UInt64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt8ColumnBase, manyTypes.FindProperty("UInt8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt8ArrayColumnBase, manyTypes.FindProperty("UInt8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt8ReadOnlyCollectionColumnBase, manyTypes.FindProperty("UInt8ReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uriColumnBase, manyTypes.FindProperty("Uri")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uriArrayColumnBase, manyTypes.FindProperty("UriArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uriToStringConverterPropertyColumnBase, manyTypes.FindProperty("UriToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+
+            var tableMappings1 = new List<TableMapping>();
+            manyTypes.SetRuntimeAnnotation("Relational:TableMappings", tableMappings1);
+            var manyTypesTable = new Table("ManyTypes", null, relationalModel);
+            var idColumn0 = new Column("Id", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("Id", idColumn0);
+            idColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(idColumn0);
+            idColumn0.AddAnnotation("Jet:Identity", "3, 2");
+            var boolColumn = new Column("Bool", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Bool", boolColumn);
+            boolColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<bool>(boolColumn);
+            var boolArrayColumn = new Column("BoolArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolArray", boolArrayColumn);
+            boolArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(boolArrayColumn);
+            var boolReadOnlyCollectionColumn = new Column("BoolReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolReadOnlyCollection", boolReadOnlyCollectionColumn);
+            boolReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(boolReadOnlyCollectionColumn);
+            var boolToStringConverterPropertyColumn = new Column("BoolToStringConverterProperty", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolToStringConverterProperty", boolToStringConverterPropertyColumn);
+            boolToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(boolToStringConverterPropertyColumn);
+            var boolToTwoValuesConverterPropertyColumn = new Column("BoolToTwoValuesConverterProperty", "byte", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolToTwoValuesConverterProperty", boolToTwoValuesConverterPropertyColumn);
+            boolToTwoValuesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(boolToTwoValuesConverterPropertyColumn);
+            var boolToZeroOneConverterPropertyColumn = new Column("BoolToZeroOneConverterProperty", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolToZeroOneConverterProperty", boolToZeroOneConverterPropertyColumn);
+            boolToZeroOneConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(boolToZeroOneConverterPropertyColumn);
+            var bytesColumn = new Column("Bytes", "longbinary", manyTypesTable);
+            manyTypesTable.Columns.Add("Bytes", bytesColumn);
+            bytesColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(bytesColumn);
+            var bytesArrayColumn = new Column("BytesArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("BytesArray", bytesArrayColumn);
+            bytesArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(bytesArrayColumn);
+            var bytesToStringConverterPropertyColumn = new Column("BytesToStringConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("BytesToStringConverterProperty", bytesToStringConverterPropertyColumn);
+            bytesToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(bytesToStringConverterPropertyColumn);
+            var castingConverterPropertyColumn = new Column("CastingConverterProperty", "decimal(18,2)", manyTypesTable);
+            manyTypesTable.Columns.Add("CastingConverterProperty", castingConverterPropertyColumn);
+            castingConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(castingConverterPropertyColumn);
+            var charColumn = new Column("Char", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("Char", charColumn);
+            charColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(charColumn);
+            var charArrayColumn = new Column("CharArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("CharArray", charArrayColumn);
+            charArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(charArrayColumn);
+            var charToStringConverterPropertyColumn = new Column("CharToStringConverterProperty", "char(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumn);
+            charToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(charToStringConverterPropertyColumn);
+            var dateOnlyColumn = new Column("DateOnly", "date", manyTypesTable);
+            manyTypesTable.Columns.Add("DateOnly", dateOnlyColumn);
+            dateOnlyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateOnly>(dateOnlyColumn);
+            var dateOnlyArrayColumn = new Column("DateOnlyArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateOnlyArray", dateOnlyArrayColumn);
+            dateOnlyArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateOnlyArrayColumn);
+            var dateOnlyToStringConverterPropertyColumn = new Column("DateOnlyToStringConverterProperty", "varchar(10)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateOnlyToStringConverterProperty", dateOnlyToStringConverterPropertyColumn);
+            dateOnlyToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateOnlyToStringConverterPropertyColumn);
+            var dateTimeColumn = new Column("DateTime", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTime", dateTimeColumn);
+            dateTimeColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTime>(dateTimeColumn);
+            var dateTimeArrayColumn = new Column("DateTimeArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeArray", dateTimeArrayColumn);
+            dateTimeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateTimeArrayColumn);
+            var dateTimeOffsetToBinaryConverterPropertyColumn = new Column("DateTimeOffsetToBinaryConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeOffsetToBinaryConverterProperty", dateTimeOffsetToBinaryConverterPropertyColumn);
+            dateTimeOffsetToBinaryConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(dateTimeOffsetToBinaryConverterPropertyColumn);
+            var dateTimeOffsetToBytesConverterPropertyColumn = new Column("DateTimeOffsetToBytesConverterProperty", "varbinary(12)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeOffsetToBytesConverterProperty", dateTimeOffsetToBytesConverterPropertyColumn);
+            dateTimeOffsetToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(dateTimeOffsetToBytesConverterPropertyColumn);
+            var dateTimeOffsetToStringConverterPropertyColumn = new Column("DateTimeOffsetToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeOffsetToStringConverterProperty", dateTimeOffsetToStringConverterPropertyColumn);
+            dateTimeOffsetToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateTimeOffsetToStringConverterPropertyColumn);
+            var dateTimeToBinaryConverterPropertyColumn = new Column("DateTimeToBinaryConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeToBinaryConverterProperty", dateTimeToBinaryConverterPropertyColumn);
+            dateTimeToBinaryConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(dateTimeToBinaryConverterPropertyColumn);
+            var dateTimeToStringConverterPropertyColumn = new Column("DateTimeToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeToStringConverterProperty", dateTimeToStringConverterPropertyColumn);
+            dateTimeToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateTimeToStringConverterPropertyColumn);
+            var dateTimeToTicksConverterPropertyColumn = new Column("DateTimeToTicksConverterProperty", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeToTicksConverterProperty", dateTimeToTicksConverterPropertyColumn);
+            dateTimeToTicksConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTime>(dateTimeToTicksConverterPropertyColumn);
+            var decimalColumn = new Column("Decimal", "decimal(18,2)", manyTypesTable);
+            manyTypesTable.Columns.Add("Decimal", decimalColumn);
+            decimalColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(decimalColumn);
+            var decimalArrayColumn = new Column("DecimalArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("DecimalArray", decimalArrayColumn);
+            decimalArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(decimalArrayColumn);
+            var decimalNumberToBytesConverterPropertyColumn = new Column("DecimalNumberToBytesConverterProperty", "varbinary(16)", manyTypesTable);
+            manyTypesTable.Columns.Add("DecimalNumberToBytesConverterProperty", decimalNumberToBytesConverterPropertyColumn);
+            decimalNumberToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(decimalNumberToBytesConverterPropertyColumn);
+            var decimalNumberToStringConverterPropertyColumn = new Column("DecimalNumberToStringConverterProperty", "varchar(64)", manyTypesTable);
+            manyTypesTable.Columns.Add("DecimalNumberToStringConverterProperty", decimalNumberToStringConverterPropertyColumn);
+            decimalNumberToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(decimalNumberToStringConverterPropertyColumn);
+            var doubleColumn = new Column("Double", "double", manyTypesTable);
+            manyTypesTable.Columns.Add("Double", doubleColumn);
+            doubleColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<double>(doubleColumn);
+            var doubleArrayColumn = new Column("DoubleArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("DoubleArray", doubleArrayColumn);
+            doubleArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(doubleArrayColumn);
+            var doubleNumberToBytesConverterPropertyColumn = new Column("DoubleNumberToBytesConverterProperty", "varbinary(8)", manyTypesTable);
+            manyTypesTable.Columns.Add("DoubleNumberToBytesConverterProperty", doubleNumberToBytesConverterPropertyColumn);
+            doubleNumberToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(doubleNumberToBytesConverterPropertyColumn);
+            var doubleNumberToStringConverterPropertyColumn = new Column("DoubleNumberToStringConverterProperty", "varchar(64)", manyTypesTable);
+            manyTypesTable.Columns.Add("DoubleNumberToStringConverterProperty", doubleNumberToStringConverterPropertyColumn);
+            doubleNumberToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(doubleNumberToStringConverterPropertyColumn);
+            var enum16Column = new Column("Enum16", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16", enum16Column);
+            enum16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(enum16Column);
+            var enum16ArrayColumn = new Column("Enum16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16Array", enum16ArrayColumn);
+            enum16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16ArrayColumn);
+            var enum16AsStringColumn = new Column("Enum16AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16AsString", enum16AsStringColumn);
+            enum16AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16AsStringColumn);
+            var enum16AsStringArrayColumn = new Column("Enum16AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16AsStringArray", enum16AsStringArrayColumn);
+            enum16AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16AsStringArrayColumn);
+            var enum16AsStringCollectionColumn = new Column("Enum16AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16AsStringCollection", enum16AsStringCollectionColumn);
+            enum16AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16AsStringCollectionColumn);
+            var enum16CollectionColumn = new Column("Enum16Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16Collection", enum16CollectionColumn);
+            enum16CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16CollectionColumn);
+            var enum32Column = new Column("Enum32", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32", enum32Column);
+            enum32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum32Column);
+            var enum32ArrayColumn = new Column("Enum32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32Array", enum32ArrayColumn);
+            enum32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32ArrayColumn);
+            var enum32AsStringColumn = new Column("Enum32AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32AsString", enum32AsStringColumn);
+            enum32AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32AsStringColumn);
+            var enum32AsStringArrayColumn = new Column("Enum32AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32AsStringArray", enum32AsStringArrayColumn);
+            enum32AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32AsStringArrayColumn);
+            var enum32AsStringCollectionColumn = new Column("Enum32AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32AsStringCollection", enum32AsStringCollectionColumn);
+            enum32AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32AsStringCollectionColumn);
+            var enum32CollectionColumn = new Column("Enum32Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32Collection", enum32CollectionColumn);
+            enum32CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32CollectionColumn);
+            var enum64Column = new Column("Enum64", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64", enum64Column);
+            enum64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(enum64Column);
+            var enum64ArrayColumn = new Column("Enum64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64Array", enum64ArrayColumn);
+            enum64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64ArrayColumn);
+            var enum64AsStringColumn = new Column("Enum64AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64AsString", enum64AsStringColumn);
+            enum64AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64AsStringColumn);
+            var enum64AsStringArrayColumn = new Column("Enum64AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64AsStringArray", enum64AsStringArrayColumn);
+            enum64AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64AsStringArrayColumn);
+            var enum64AsStringCollectionColumn = new Column("Enum64AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64AsStringCollection", enum64AsStringCollectionColumn);
+            enum64AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64AsStringCollectionColumn);
+            var enum64CollectionColumn = new Column("Enum64Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64Collection", enum64CollectionColumn);
+            enum64CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64CollectionColumn);
+            var enum8Column = new Column("Enum8", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8", enum8Column);
+            enum8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(enum8Column);
+            var enum8ArrayColumn = new Column("Enum8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8Array", enum8ArrayColumn);
+            enum8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8ArrayColumn);
+            var enum8AsStringColumn = new Column("Enum8AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8AsString", enum8AsStringColumn);
+            enum8AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8AsStringColumn);
+            var enum8AsStringArrayColumn = new Column("Enum8AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8AsStringArray", enum8AsStringArrayColumn);
+            enum8AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8AsStringArrayColumn);
+            var enum8AsStringCollectionColumn = new Column("Enum8AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8AsStringCollection", enum8AsStringCollectionColumn);
+            enum8AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8AsStringCollectionColumn);
+            var enum8CollectionColumn = new Column("Enum8Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8Collection", enum8CollectionColumn);
+            enum8CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8CollectionColumn);
+            var enumToNumberConverterPropertyColumn = new Column("EnumToNumberConverterProperty", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumToNumberConverterProperty", enumToNumberConverterPropertyColumn);
+            enumToNumberConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enumToNumberConverterPropertyColumn);
+            var enumToStringConverterPropertyColumn = new Column("EnumToStringConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumToStringConverterProperty", enumToStringConverterPropertyColumn);
+            enumToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumToStringConverterPropertyColumn);
+            var enumU16Column = new Column("EnumU16", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16", enumU16Column);
+            enumU16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enumU16Column);
+            var enumU16ArrayColumn = new Column("EnumU16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16Array", enumU16ArrayColumn);
+            enumU16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16ArrayColumn);
+            var enumU16AsStringColumn = new Column("EnumU16AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16AsString", enumU16AsStringColumn);
+            enumU16AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16AsStringColumn);
+            var enumU16AsStringArrayColumn = new Column("EnumU16AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16AsStringArray", enumU16AsStringArrayColumn);
+            enumU16AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16AsStringArrayColumn);
+            var enumU16AsStringCollectionColumn = new Column("EnumU16AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16AsStringCollection", enumU16AsStringCollectionColumn);
+            enumU16AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16AsStringCollectionColumn);
+            var enumU16CollectionColumn = new Column("EnumU16Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16Collection", enumU16CollectionColumn);
+            enumU16CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16CollectionColumn);
+            var enumU32Column = new Column("EnumU32", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32", enumU32Column);
+            enumU32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(enumU32Column);
+            var enumU32ArrayColumn = new Column("EnumU32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32Array", enumU32ArrayColumn);
+            enumU32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32ArrayColumn);
+            var enumU32AsStringColumn = new Column("EnumU32AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32AsString", enumU32AsStringColumn);
+            enumU32AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32AsStringColumn);
+            var enumU32AsStringArrayColumn = new Column("EnumU32AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32AsStringArray", enumU32AsStringArrayColumn);
+            enumU32AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32AsStringArrayColumn);
+            var enumU32AsStringCollectionColumn = new Column("EnumU32AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32AsStringCollection", enumU32AsStringCollectionColumn);
+            enumU32AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32AsStringCollectionColumn);
+            var enumU32CollectionColumn = new Column("EnumU32Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32Collection", enumU32CollectionColumn);
+            enumU32CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32CollectionColumn);
+            var enumU64Column = new Column("EnumU64", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64", enumU64Column);
+            enumU64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(enumU64Column);
+            var enumU64ArrayColumn = new Column("EnumU64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64Array", enumU64ArrayColumn);
+            enumU64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64ArrayColumn);
+            var enumU64AsStringColumn = new Column("EnumU64AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64AsString", enumU64AsStringColumn);
+            enumU64AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64AsStringColumn);
+            var enumU64AsStringArrayColumn = new Column("EnumU64AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64AsStringArray", enumU64AsStringArrayColumn);
+            enumU64AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64AsStringArrayColumn);
+            var enumU64AsStringCollectionColumn = new Column("EnumU64AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64AsStringCollection", enumU64AsStringCollectionColumn);
+            enumU64AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64AsStringCollectionColumn);
+            var enumU64CollectionColumn = new Column("EnumU64Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64Collection", enumU64CollectionColumn);
+            enumU64CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64CollectionColumn);
+            var enumU8Column = new Column("EnumU8", "byte", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8", enumU8Column);
+            enumU8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(enumU8Column);
+            var enumU8ArrayColumn = new Column("EnumU8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8Array", enumU8ArrayColumn);
+            enumU8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8ArrayColumn);
+            var enumU8AsStringColumn = new Column("EnumU8AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8AsString", enumU8AsStringColumn);
+            enumU8AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8AsStringColumn);
+            var enumU8AsStringArrayColumn = new Column("EnumU8AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8AsStringArray", enumU8AsStringArrayColumn);
+            enumU8AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8AsStringArrayColumn);
+            var enumU8AsStringCollectionColumn = new Column("EnumU8AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8AsStringCollection", enumU8AsStringCollectionColumn);
+            enumU8AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8AsStringCollectionColumn);
+            var enumU8CollectionColumn = new Column("EnumU8Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8Collection", enumU8CollectionColumn);
+            enumU8CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8CollectionColumn);
+            var floatColumn = new Column("Float", "single", manyTypesTable);
+            manyTypesTable.Columns.Add("Float", floatColumn);
+            floatColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<float>(floatColumn);
+            var floatArrayColumn = new Column("FloatArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("FloatArray", floatArrayColumn);
+            floatArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(floatArrayColumn);
+            var guidColumn = new Column("Guid", "uniqueidentifier", manyTypesTable);
+            manyTypesTable.Columns.Add("Guid", guidColumn);
+            guidColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(guidColumn);
+            var guidArrayColumn = new Column("GuidArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("GuidArray", guidArrayColumn);
+            guidArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(guidArrayColumn);
+            var guidToBytesConverterPropertyColumn = new Column("GuidToBytesConverterProperty", "varbinary(16)", manyTypesTable);
+            manyTypesTable.Columns.Add("GuidToBytesConverterProperty", guidToBytesConverterPropertyColumn);
+            guidToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(guidToBytesConverterPropertyColumn);
+            var guidToStringConverterPropertyColumn = new Column("GuidToStringConverterProperty", "varchar(36)", manyTypesTable);
+            manyTypesTable.Columns.Add("GuidToStringConverterProperty", guidToStringConverterPropertyColumn);
+            guidToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(guidToStringConverterPropertyColumn);
+            var iPAddressColumn = new Column("IPAddress", "varchar(45)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddress", iPAddressColumn);
+            iPAddressColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(iPAddressColumn);
+            var iPAddressArrayColumn = new Column("IPAddressArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressArray", iPAddressArrayColumn);
+            iPAddressArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(iPAddressArrayColumn);
+            var iPAddressReadOnlyCollectionColumn = new Column("IPAddressReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressReadOnlyCollection", iPAddressReadOnlyCollectionColumn);
+            iPAddressReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(iPAddressReadOnlyCollectionColumn);
+            var iPAddressToBytesConverterPropertyColumn = new Column("IPAddressToBytesConverterProperty", "varbinary(16)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressToBytesConverterProperty", iPAddressToBytesConverterPropertyColumn);
+            iPAddressToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(iPAddressToBytesConverterPropertyColumn);
+            var iPAddressToStringConverterPropertyColumn = new Column("IPAddressToStringConverterProperty", "varchar(45)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressToStringConverterProperty", iPAddressToStringConverterPropertyColumn);
+            iPAddressToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(iPAddressToStringConverterPropertyColumn);
+            var int16Column = new Column("Int16", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Int16", int16Column);
+            int16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(int16Column);
+            var int16ArrayColumn = new Column("Int16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int16Array", int16ArrayColumn);
+            int16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int16ArrayColumn);
+            var int32Column = new Column("Int32", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("Int32", int32Column);
+            int32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(int32Column);
+            var int32ArrayColumn = new Column("Int32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int32Array", int32ArrayColumn);
+            int32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int32ArrayColumn);
+            var int32ReadOnlyCollectionColumn = new Column("Int32ReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int32ReadOnlyCollection", int32ReadOnlyCollectionColumn);
+            int32ReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int32ReadOnlyCollectionColumn);
+            var int64Column = new Column("Int64", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int64", int64Column);
+            int64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(int64Column);
+            var int64ArrayColumn = new Column("Int64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int64Array", int64ArrayColumn);
+            int64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int64ArrayColumn);
+            var int8Column = new Column("Int8", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Int8", int8Column);
+            int8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(int8Column);
+            var int8ArrayColumn = new Column("Int8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int8Array", int8ArrayColumn);
+            int8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int8ArrayColumn);
+            var intNumberToBytesConverterPropertyColumn = new Column("IntNumberToBytesConverterProperty", "varbinary(4)", manyTypesTable);
+            manyTypesTable.Columns.Add("IntNumberToBytesConverterProperty", intNumberToBytesConverterPropertyColumn);
+            intNumberToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(intNumberToBytesConverterPropertyColumn);
+            var intNumberToStringConverterPropertyColumn = new Column("IntNumberToStringConverterProperty", "varchar(64)", manyTypesTable);
+            manyTypesTable.Columns.Add("IntNumberToStringConverterProperty", intNumberToStringConverterPropertyColumn);
+            intNumberToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(intNumberToStringConverterPropertyColumn);
+            var nullIntToNullStringConverterPropertyColumn = new Column("NullIntToNullStringConverterProperty", "varchar(255)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullIntToNullStringConverterProperty", nullIntToNullStringConverterPropertyColumn);
+            nullIntToNullStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullIntToNullStringConverterPropertyColumn);
+            var nullableBoolColumn = new Column("NullableBool", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableBool", nullableBoolColumn);
+            nullableBoolColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<bool>(nullableBoolColumn);
+            var nullableBoolArrayColumn = new Column("NullableBoolArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableBoolArray", nullableBoolArrayColumn);
+            nullableBoolArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableBoolArrayColumn);
+            var nullableBytesColumn = new Column("NullableBytes", "longbinary", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableBytes", nullableBytesColumn);
+            nullableBytesColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(nullableBytesColumn);
+            var nullableBytesArrayColumn = new Column("NullableBytesArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableBytesArray", nullableBytesArrayColumn);
+            nullableBytesArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableBytesArrayColumn);
+            var nullableCharColumn = new Column("NullableChar", "varchar(1)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableChar", nullableCharColumn);
+            nullableCharColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableCharColumn);
+            var nullableCharArrayColumn = new Column("NullableCharArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableCharArray", nullableCharArrayColumn);
+            nullableCharArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableCharArrayColumn);
+            var nullableDateOnlyColumn = new Column("NullableDateOnly", "date", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDateOnly", nullableDateOnlyColumn);
+            nullableDateOnlyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateOnly>(nullableDateOnlyColumn);
+            var nullableDateOnlyArrayColumn = new Column("NullableDateOnlyArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDateOnlyArray", nullableDateOnlyArrayColumn);
+            nullableDateOnlyArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableDateOnlyArrayColumn);
+            var nullableDateTimeColumn = new Column("NullableDateTime", "datetime", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDateTime", nullableDateTimeColumn);
+            nullableDateTimeColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTime>(nullableDateTimeColumn);
+            var nullableDateTimeArrayColumn = new Column("NullableDateTimeArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDateTimeArray", nullableDateTimeArrayColumn);
+            nullableDateTimeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableDateTimeArrayColumn);
+            var nullableDecimalColumn = new Column("NullableDecimal", "decimal(18,2)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDecimal", nullableDecimalColumn);
+            nullableDecimalColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(nullableDecimalColumn);
+            var nullableDecimalArrayColumn = new Column("NullableDecimalArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDecimalArray", nullableDecimalArrayColumn);
+            nullableDecimalArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableDecimalArrayColumn);
+            var nullableDoubleColumn = new Column("NullableDouble", "double", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDouble", nullableDoubleColumn);
+            nullableDoubleColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<double>(nullableDoubleColumn);
+            var nullableDoubleArrayColumn = new Column("NullableDoubleArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDoubleArray", nullableDoubleArrayColumn);
+            nullableDoubleArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableDoubleArrayColumn);
+            var nullableEnum16Column = new Column("NullableEnum16", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum16", nullableEnum16Column);
+            nullableEnum16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableEnum16Column);
+            var nullableEnum16ArrayColumn = new Column("NullableEnum16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16Array", nullableEnum16ArrayColumn);
+            nullableEnum16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum16ArrayColumn);
+            var nullableEnum16AsStringColumn = new Column("NullableEnum16AsString", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum16AsString", nullableEnum16AsStringColumn);
+            nullableEnum16AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableEnum16AsStringColumn);
+            var nullableEnum16AsStringArrayColumn = new Column("NullableEnum16AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16AsStringArray", nullableEnum16AsStringArrayColumn);
+            nullableEnum16AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum16AsStringArrayColumn);
+            var nullableEnum16AsStringCollectionColumn = new Column("NullableEnum16AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16AsStringCollection", nullableEnum16AsStringCollectionColumn);
+            nullableEnum16AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum16AsStringCollectionColumn);
+            var nullableEnum16CollectionColumn = new Column("NullableEnum16Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16Collection", nullableEnum16CollectionColumn);
+            nullableEnum16CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum16CollectionColumn);
+            var nullableEnum32Column = new Column("NullableEnum32", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum32", nullableEnum32Column);
+            nullableEnum32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableEnum32Column);
+            var nullableEnum32ArrayColumn = new Column("NullableEnum32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32Array", nullableEnum32ArrayColumn);
+            nullableEnum32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum32ArrayColumn);
+            var nullableEnum32AsStringColumn = new Column("NullableEnum32AsString", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum32AsString", nullableEnum32AsStringColumn);
+            nullableEnum32AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableEnum32AsStringColumn);
+            var nullableEnum32AsStringArrayColumn = new Column("NullableEnum32AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32AsStringArray", nullableEnum32AsStringArrayColumn);
+            nullableEnum32AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum32AsStringArrayColumn);
+            var nullableEnum32AsStringCollectionColumn = new Column("NullableEnum32AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32AsStringCollection", nullableEnum32AsStringCollectionColumn);
+            nullableEnum32AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum32AsStringCollectionColumn);
+            var nullableEnum32CollectionColumn = new Column("NullableEnum32Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32Collection", nullableEnum32CollectionColumn);
+            nullableEnum32CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum32CollectionColumn);
+            var nullableEnum64Column = new Column("NullableEnum64", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum64", nullableEnum64Column);
+            nullableEnum64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableEnum64Column);
+            var nullableEnum64ArrayColumn = new Column("NullableEnum64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64Array", nullableEnum64ArrayColumn);
+            nullableEnum64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum64ArrayColumn);
+            var nullableEnum64AsStringColumn = new Column("NullableEnum64AsString", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum64AsString", nullableEnum64AsStringColumn);
+            nullableEnum64AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableEnum64AsStringColumn);
+            var nullableEnum64AsStringArrayColumn = new Column("NullableEnum64AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64AsStringArray", nullableEnum64AsStringArrayColumn);
+            nullableEnum64AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum64AsStringArrayColumn);
+            var nullableEnum64AsStringCollectionColumn = new Column("NullableEnum64AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64AsStringCollection", nullableEnum64AsStringCollectionColumn);
+            nullableEnum64AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum64AsStringCollectionColumn);
+            var nullableEnum64CollectionColumn = new Column("NullableEnum64Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64Collection", nullableEnum64CollectionColumn);
+            nullableEnum64CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum64CollectionColumn);
+            var nullableEnum8Column = new Column("NullableEnum8", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum8", nullableEnum8Column);
+            nullableEnum8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableEnum8Column);
+            var nullableEnum8ArrayColumn = new Column("NullableEnum8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8Array", nullableEnum8ArrayColumn);
+            nullableEnum8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum8ArrayColumn);
+            var nullableEnum8AsStringColumn = new Column("NullableEnum8AsString", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum8AsString", nullableEnum8AsStringColumn);
+            nullableEnum8AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableEnum8AsStringColumn);
+            var nullableEnum8AsStringArrayColumn = new Column("NullableEnum8AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8AsStringArray", nullableEnum8AsStringArrayColumn);
+            nullableEnum8AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum8AsStringArrayColumn);
+            var nullableEnum8AsStringCollectionColumn = new Column("NullableEnum8AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8AsStringCollection", nullableEnum8AsStringCollectionColumn);
+            nullableEnum8AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum8AsStringCollectionColumn);
+            var nullableEnum8CollectionColumn = new Column("NullableEnum8Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8Collection", nullableEnum8CollectionColumn);
+            nullableEnum8CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum8CollectionColumn);
+            var nullableEnumU16Column = new Column("NullableEnumU16", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU16", nullableEnumU16Column);
+            nullableEnumU16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableEnumU16Column);
+            var nullableEnumU16ArrayColumn = new Column("NullableEnumU16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16Array", nullableEnumU16ArrayColumn);
+            nullableEnumU16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU16ArrayColumn);
+            var nullableEnumU16AsStringColumn = new Column("NullableEnumU16AsString", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU16AsString", nullableEnumU16AsStringColumn);
+            nullableEnumU16AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableEnumU16AsStringColumn);
+            var nullableEnumU16AsStringArrayColumn = new Column("NullableEnumU16AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16AsStringArray", nullableEnumU16AsStringArrayColumn);
+            nullableEnumU16AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU16AsStringArrayColumn);
+            var nullableEnumU16AsStringCollectionColumn = new Column("NullableEnumU16AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16AsStringCollection", nullableEnumU16AsStringCollectionColumn);
+            nullableEnumU16AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU16AsStringCollectionColumn);
+            var nullableEnumU16CollectionColumn = new Column("NullableEnumU16Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16Collection", nullableEnumU16CollectionColumn);
+            nullableEnumU16CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU16CollectionColumn);
+            var nullableEnumU32Column = new Column("NullableEnumU32", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU32", nullableEnumU32Column);
+            nullableEnumU32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableEnumU32Column);
+            var nullableEnumU32ArrayColumn = new Column("NullableEnumU32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32Array", nullableEnumU32ArrayColumn);
+            nullableEnumU32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU32ArrayColumn);
+            var nullableEnumU32AsStringColumn = new Column("NullableEnumU32AsString", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU32AsString", nullableEnumU32AsStringColumn);
+            nullableEnumU32AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableEnumU32AsStringColumn);
+            var nullableEnumU32AsStringArrayColumn = new Column("NullableEnumU32AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32AsStringArray", nullableEnumU32AsStringArrayColumn);
+            nullableEnumU32AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU32AsStringArrayColumn);
+            var nullableEnumU32AsStringCollectionColumn = new Column("NullableEnumU32AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32AsStringCollection", nullableEnumU32AsStringCollectionColumn);
+            nullableEnumU32AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU32AsStringCollectionColumn);
+            var nullableEnumU32CollectionColumn = new Column("NullableEnumU32Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32Collection", nullableEnumU32CollectionColumn);
+            nullableEnumU32CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU32CollectionColumn);
+            var nullableEnumU64Column = new Column("NullableEnumU64", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU64", nullableEnumU64Column);
+            nullableEnumU64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(nullableEnumU64Column);
+            var nullableEnumU64ArrayColumn = new Column("NullableEnumU64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64Array", nullableEnumU64ArrayColumn);
+            nullableEnumU64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU64ArrayColumn);
+            var nullableEnumU64AsStringColumn = new Column("NullableEnumU64AsString", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU64AsString", nullableEnumU64AsStringColumn);
+            nullableEnumU64AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(nullableEnumU64AsStringColumn);
+            var nullableEnumU64AsStringArrayColumn = new Column("NullableEnumU64AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64AsStringArray", nullableEnumU64AsStringArrayColumn);
+            nullableEnumU64AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU64AsStringArrayColumn);
+            var nullableEnumU64AsStringCollectionColumn = new Column("NullableEnumU64AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64AsStringCollection", nullableEnumU64AsStringCollectionColumn);
+            nullableEnumU64AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU64AsStringCollectionColumn);
+            var nullableEnumU64CollectionColumn = new Column("NullableEnumU64Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64Collection", nullableEnumU64CollectionColumn);
+            nullableEnumU64CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU64CollectionColumn);
+            var nullableEnumU8Column = new Column("NullableEnumU8", "byte", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU8", nullableEnumU8Column);
+            nullableEnumU8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(nullableEnumU8Column);
+            var nullableEnumU8ArrayColumn = new Column("NullableEnumU8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8Array", nullableEnumU8ArrayColumn);
+            nullableEnumU8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU8ArrayColumn);
+            var nullableEnumU8AsStringColumn = new Column("NullableEnumU8AsString", "byte", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU8AsString", nullableEnumU8AsStringColumn);
+            nullableEnumU8AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(nullableEnumU8AsStringColumn);
+            var nullableEnumU8AsStringArrayColumn = new Column("NullableEnumU8AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8AsStringArray", nullableEnumU8AsStringArrayColumn);
+            nullableEnumU8AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU8AsStringArrayColumn);
+            var nullableEnumU8AsStringCollectionColumn = new Column("NullableEnumU8AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8AsStringCollection", nullableEnumU8AsStringCollectionColumn);
+            nullableEnumU8AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU8AsStringCollectionColumn);
+            var nullableEnumU8CollectionColumn = new Column("NullableEnumU8Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8Collection", nullableEnumU8CollectionColumn);
+            nullableEnumU8CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU8CollectionColumn);
+            var nullableFloatColumn = new Column("NullableFloat", "single", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableFloat", nullableFloatColumn);
+            nullableFloatColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<float>(nullableFloatColumn);
+            var nullableFloatArrayColumn = new Column("NullableFloatArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableFloatArray", nullableFloatArrayColumn);
+            nullableFloatArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableFloatArrayColumn);
+            var nullableGuidColumn = new Column("NullableGuid", "uniqueidentifier", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableGuid", nullableGuidColumn);
+            nullableGuidColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(nullableGuidColumn);
+            var nullableGuidArrayColumn = new Column("NullableGuidArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableGuidArray", nullableGuidArrayColumn);
+            nullableGuidArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableGuidArrayColumn);
+            var nullableIPAddressColumn = new Column("NullableIPAddress", "varchar(45)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableIPAddress", nullableIPAddressColumn);
+            nullableIPAddressColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableIPAddressColumn);
+            var nullableIPAddressArrayColumn = new Column("NullableIPAddressArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableIPAddressArray", nullableIPAddressArrayColumn);
+            nullableIPAddressArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableIPAddressArrayColumn);
+            var nullableInt16Column = new Column("NullableInt16", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt16", nullableInt16Column);
+            nullableInt16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableInt16Column);
+            var nullableInt16ArrayColumn = new Column("NullableInt16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt16Array", nullableInt16ArrayColumn);
+            nullableInt16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableInt16ArrayColumn);
+            var nullableInt32Column = new Column("NullableInt32", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt32", nullableInt32Column);
+            nullableInt32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableInt32Column);
+            var nullableInt32ArrayColumn = new Column("NullableInt32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt32Array", nullableInt32ArrayColumn);
+            nullableInt32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableInt32ArrayColumn);
+            var nullableInt64Column = new Column("NullableInt64", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt64", nullableInt64Column);
+            nullableInt64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableInt64Column);
+            var nullableInt64ArrayColumn = new Column("NullableInt64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt64Array", nullableInt64ArrayColumn);
+            nullableInt64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableInt64ArrayColumn);
+            var nullableInt8Column = new Column("NullableInt8", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt8", nullableInt8Column);
+            nullableInt8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableInt8Column);
+            var nullableInt8ArrayColumn = new Column("NullableInt8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt8Array", nullableInt8ArrayColumn);
+            nullableInt8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableInt8ArrayColumn);
+            var nullablePhysicalAddressColumn = new Column("NullablePhysicalAddress", "varchar(20)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullablePhysicalAddress", nullablePhysicalAddressColumn);
+            nullablePhysicalAddressColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullablePhysicalAddressColumn);
+            var nullablePhysicalAddressArrayColumn = new Column("NullablePhysicalAddressArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullablePhysicalAddressArray", nullablePhysicalAddressArrayColumn);
+            nullablePhysicalAddressArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullablePhysicalAddressArrayColumn);
+            var nullableStringColumn = new Column("NullableString", "varchar(255)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableString", nullableStringColumn);
+            nullableStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableStringColumn);
+            var nullableStringArrayColumn = new Column("NullableStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableStringArray", nullableStringArrayColumn);
+            nullableStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableStringArrayColumn);
+            var nullableTimeOnlyColumn = new Column("NullableTimeOnly", "time", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableTimeOnly", nullableTimeOnlyColumn);
+            nullableTimeOnlyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeOnly>(nullableTimeOnlyColumn);
+            var nullableTimeOnlyArrayColumn = new Column("NullableTimeOnlyArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableTimeOnlyArray", nullableTimeOnlyArrayColumn);
+            nullableTimeOnlyArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableTimeOnlyArrayColumn);
+            var nullableTimeSpanColumn = new Column("NullableTimeSpan", "datetime", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableTimeSpan", nullableTimeSpanColumn);
+            nullableTimeSpanColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeSpan>(nullableTimeSpanColumn);
+            var nullableTimeSpanArrayColumn = new Column("NullableTimeSpanArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableTimeSpanArray", nullableTimeSpanArrayColumn);
+            nullableTimeSpanArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableTimeSpanArrayColumn);
+            var nullableUInt16Column = new Column("NullableUInt16", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt16", nullableUInt16Column);
+            nullableUInt16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableUInt16Column);
+            var nullableUInt16ArrayColumn = new Column("NullableUInt16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt16Array", nullableUInt16ArrayColumn);
+            nullableUInt16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUInt16ArrayColumn);
+            var nullableUInt32Column = new Column("NullableUInt32", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt32", nullableUInt32Column);
+            nullableUInt32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableUInt32Column);
+            var nullableUInt32ArrayColumn = new Column("NullableUInt32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt32Array", nullableUInt32ArrayColumn);
+            nullableUInt32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUInt32ArrayColumn);
+            var nullableUInt64Column = new Column("NullableUInt64", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt64", nullableUInt64Column);
+            nullableUInt64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(nullableUInt64Column);
+            var nullableUInt64ArrayColumn = new Column("NullableUInt64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt64Array", nullableUInt64ArrayColumn);
+            nullableUInt64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUInt64ArrayColumn);
+            var nullableUInt8Column = new Column("NullableUInt8", "byte", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt8", nullableUInt8Column);
+            nullableUInt8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(nullableUInt8Column);
+            var nullableUInt8ArrayColumn = new Column("NullableUInt8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt8Array", nullableUInt8ArrayColumn);
+            nullableUInt8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUInt8ArrayColumn);
+            var nullableUriColumn = new Column("NullableUri", "varchar(255)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUri", nullableUriColumn);
+            nullableUriColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUriColumn);
+            var nullableUriArrayColumn = new Column("NullableUriArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUriArray", nullableUriArrayColumn);
+            nullableUriArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUriArrayColumn);
+            var physicalAddressColumn = new Column("PhysicalAddress", "varchar(20)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddress", physicalAddressColumn);
+            physicalAddressColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(physicalAddressColumn);
+            var physicalAddressArrayColumn = new Column("PhysicalAddressArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddressArray", physicalAddressArrayColumn);
+            physicalAddressArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(physicalAddressArrayColumn);
+            var physicalAddressToBytesConverterPropertyColumn = new Column("PhysicalAddressToBytesConverterProperty", "varbinary(8)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddressToBytesConverterProperty", physicalAddressToBytesConverterPropertyColumn);
+            physicalAddressToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(physicalAddressToBytesConverterPropertyColumn);
+            var physicalAddressToStringConverterPropertyColumn = new Column("PhysicalAddressToStringConverterProperty", "varchar(20)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddressToStringConverterProperty", physicalAddressToStringConverterPropertyColumn);
+            physicalAddressToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(physicalAddressToStringConverterPropertyColumn);
+            var stringColumn = new Column("String", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("String", stringColumn);
+            stringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringColumn);
+            var stringArrayColumn = new Column("StringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringArray", stringArrayColumn);
+            stringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringArrayColumn);
+            var stringReadOnlyCollectionColumn = new Column("StringReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringReadOnlyCollection", stringReadOnlyCollectionColumn);
+            stringReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringReadOnlyCollectionColumn);
+            var stringToBoolConverterPropertyColumn = new Column("StringToBoolConverterProperty", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToBoolConverterProperty", stringToBoolConverterPropertyColumn);
+            stringToBoolConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<bool>(stringToBoolConverterPropertyColumn);
+            var stringToBytesConverterPropertyColumn = new Column("StringToBytesConverterProperty", "longbinary", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("StringToBytesConverterProperty", stringToBytesConverterPropertyColumn);
+            stringToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(stringToBytesConverterPropertyColumn);
+            var stringToCharConverterPropertyColumn = new Column("StringToCharConverterProperty", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToCharConverterProperty", stringToCharConverterPropertyColumn);
+            stringToCharConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringToCharConverterPropertyColumn);
+            var stringToDateOnlyConverterPropertyColumn = new Column("StringToDateOnlyConverterProperty", "date", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDateOnlyConverterProperty", stringToDateOnlyConverterPropertyColumn);
+            stringToDateOnlyConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateOnly>(stringToDateOnlyConverterPropertyColumn);
+            var stringToDateTimeConverterPropertyColumn = new Column("StringToDateTimeConverterProperty", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDateTimeConverterProperty", stringToDateTimeConverterPropertyColumn);
+            stringToDateTimeConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTime>(stringToDateTimeConverterPropertyColumn);
+            var stringToDateTimeOffsetConverterPropertyColumn = new Column("StringToDateTimeOffsetConverterProperty", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDateTimeOffsetConverterProperty", stringToDateTimeOffsetConverterPropertyColumn);
+            stringToDateTimeOffsetConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTimeOffset>(stringToDateTimeOffsetConverterPropertyColumn);
+            var stringToDecimalNumberConverterPropertyColumn = new Column("StringToDecimalNumberConverterProperty", "decimal(18,2)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDecimalNumberConverterProperty", stringToDecimalNumberConverterPropertyColumn);
+            stringToDecimalNumberConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(stringToDecimalNumberConverterPropertyColumn);
+            var stringToDoubleNumberConverterPropertyColumn = new Column("StringToDoubleNumberConverterProperty", "double", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDoubleNumberConverterProperty", stringToDoubleNumberConverterPropertyColumn);
+            stringToDoubleNumberConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<double>(stringToDoubleNumberConverterPropertyColumn);
+            var stringToEnumConverterPropertyColumn = new Column("StringToEnumConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToEnumConverterProperty", stringToEnumConverterPropertyColumn);
+            stringToEnumConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(stringToEnumConverterPropertyColumn);
+            var stringToGuidConverterPropertyColumn = new Column("StringToGuidConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToGuidConverterProperty", stringToGuidConverterPropertyColumn);
+            stringToGuidConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringToGuidConverterPropertyColumn);
+            var stringToIntNumberConverterPropertyColumn = new Column("StringToIntNumberConverterProperty", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToIntNumberConverterProperty", stringToIntNumberConverterPropertyColumn);
+            stringToIntNumberConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(stringToIntNumberConverterPropertyColumn);
+            var stringToTimeOnlyConverterPropertyColumn = new Column("StringToTimeOnlyConverterProperty", "time", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToTimeOnlyConverterProperty", stringToTimeOnlyConverterPropertyColumn);
+            stringToTimeOnlyConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeOnly>(stringToTimeOnlyConverterPropertyColumn);
+            var stringToTimeSpanConverterPropertyColumn = new Column("StringToTimeSpanConverterProperty", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToTimeSpanConverterProperty", stringToTimeSpanConverterPropertyColumn);
+            stringToTimeSpanConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeSpan>(stringToTimeSpanConverterPropertyColumn);
+            var stringToUriConverterPropertyColumn = new Column("StringToUriConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToUriConverterProperty", stringToUriConverterPropertyColumn);
+            stringToUriConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringToUriConverterPropertyColumn);
+            var timeOnlyColumn = new Column("TimeOnly", "time", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnly", timeOnlyColumn);
+            timeOnlyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeOnly>(timeOnlyColumn);
+            var timeOnlyArrayColumn = new Column("TimeOnlyArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnlyArray", timeOnlyArrayColumn);
+            timeOnlyArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(timeOnlyArrayColumn);
+            var timeOnlyToStringConverterPropertyColumn = new Column("TimeOnlyToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnlyToStringConverterProperty", timeOnlyToStringConverterPropertyColumn);
+            timeOnlyToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(timeOnlyToStringConverterPropertyColumn);
+            var timeOnlyToTicksConverterPropertyColumn = new Column("TimeOnlyToTicksConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnlyToTicksConverterProperty", timeOnlyToTicksConverterPropertyColumn);
+            timeOnlyToTicksConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(timeOnlyToTicksConverterPropertyColumn);
+            var timeSpanColumn = new Column("TimeSpan", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpan", timeSpanColumn);
+            timeSpanColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeSpan>(timeSpanColumn);
+            var timeSpanArrayColumn = new Column("TimeSpanArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpanArray", timeSpanArrayColumn);
+            timeSpanArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(timeSpanArrayColumn);
+            var timeSpanToStringConverterPropertyColumn = new Column("TimeSpanToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpanToStringConverterProperty", timeSpanToStringConverterPropertyColumn);
+            timeSpanToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(timeSpanToStringConverterPropertyColumn);
+            var timeSpanToTicksConverterPropertyColumn = new Column("TimeSpanToTicksConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpanToTicksConverterProperty", timeSpanToTicksConverterPropertyColumn);
+            timeSpanToTicksConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(timeSpanToTicksConverterPropertyColumn);
+            var uInt16Column = new Column("UInt16", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt16", uInt16Column);
+            uInt16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(uInt16Column);
+            var uInt16ArrayColumn = new Column("UInt16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt16Array", uInt16ArrayColumn);
+            uInt16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uInt16ArrayColumn);
+            var uInt32Column = new Column("UInt32", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt32", uInt32Column);
+            uInt32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(uInt32Column);
+            var uInt32ArrayColumn = new Column("UInt32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt32Array", uInt32ArrayColumn);
+            uInt32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uInt32ArrayColumn);
+            var uInt64Column = new Column("UInt64", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt64", uInt64Column);
+            uInt64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(uInt64Column);
+            var uInt64ArrayColumn = new Column("UInt64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt64Array", uInt64ArrayColumn);
+            uInt64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uInt64ArrayColumn);
+            var uInt8Column = new Column("UInt8", "byte", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt8", uInt8Column);
+            uInt8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(uInt8Column);
+            var uInt8ArrayColumn = new Column("UInt8Array", "longbinary", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt8Array", uInt8ArrayColumn);
+            uInt8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(uInt8ArrayColumn);
+            var uInt8ReadOnlyCollectionColumn = new Column("UInt8ReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt8ReadOnlyCollection", uInt8ReadOnlyCollectionColumn);
+            uInt8ReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uInt8ReadOnlyCollectionColumn);
+            var uriColumn = new Column("Uri", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Uri", uriColumn);
+            uriColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uriColumn);
+            var uriArrayColumn = new Column("UriArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UriArray", uriArrayColumn);
+            uriArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uriArrayColumn);
+            var uriToStringConverterPropertyColumn = new Column("UriToStringConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UriToStringConverterProperty", uriToStringConverterPropertyColumn);
+            uriToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uriToStringConverterPropertyColumn);
+            relationalModel.Tables.Add(("ManyTypes", null), manyTypesTable);
+            var manyTypesTableMapping = new TableMapping(manyTypes, manyTypesTable, null);
+            manyTypesTable.AddTypeMapping(manyTypesTableMapping, false);
+            tableMappings1.Add(manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn0, manyTypes.FindProperty("Id")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolColumn, manyTypes.FindProperty("Bool")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolArrayColumn, manyTypes.FindProperty("BoolArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolReadOnlyCollectionColumn, manyTypes.FindProperty("BoolReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolToStringConverterPropertyColumn, manyTypes.FindProperty("BoolToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolToTwoValuesConverterPropertyColumn, manyTypes.FindProperty("BoolToTwoValuesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolToZeroOneConverterPropertyColumn, manyTypes.FindProperty("BoolToZeroOneConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(bytesColumn, manyTypes.FindProperty("Bytes")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(bytesArrayColumn, manyTypes.FindProperty("BytesArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(bytesToStringConverterPropertyColumn, manyTypes.FindProperty("BytesToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(castingConverterPropertyColumn, manyTypes.FindProperty("CastingConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(charColumn, manyTypes.FindProperty("Char")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(charArrayColumn, manyTypes.FindProperty("CharArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(charToStringConverterPropertyColumn, manyTypes.FindProperty("CharToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateOnlyColumn, manyTypes.FindProperty("DateOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateOnlyArrayColumn, manyTypes.FindProperty("DateOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateOnlyToStringConverterPropertyColumn, manyTypes.FindProperty("DateOnlyToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeColumn, manyTypes.FindProperty("DateTime")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeArrayColumn, manyTypes.FindProperty("DateTimeArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeOffsetToBinaryConverterPropertyColumn, manyTypes.FindProperty("DateTimeOffsetToBinaryConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeOffsetToBytesConverterPropertyColumn, manyTypes.FindProperty("DateTimeOffsetToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeOffsetToStringConverterPropertyColumn, manyTypes.FindProperty("DateTimeOffsetToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeToBinaryConverterPropertyColumn, manyTypes.FindProperty("DateTimeToBinaryConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeToStringConverterPropertyColumn, manyTypes.FindProperty("DateTimeToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeToTicksConverterPropertyColumn, manyTypes.FindProperty("DateTimeToTicksConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalColumn, manyTypes.FindProperty("Decimal")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalArrayColumn, manyTypes.FindProperty("DecimalArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalNumberToBytesConverterPropertyColumn, manyTypes.FindProperty("DecimalNumberToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalNumberToStringConverterPropertyColumn, manyTypes.FindProperty("DecimalNumberToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleColumn, manyTypes.FindProperty("Double")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleArrayColumn, manyTypes.FindProperty("DoubleArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleNumberToBytesConverterPropertyColumn, manyTypes.FindProperty("DoubleNumberToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleNumberToStringConverterPropertyColumn, manyTypes.FindProperty("DoubleNumberToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16Column, manyTypes.FindProperty("Enum16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16ArrayColumn, manyTypes.FindProperty("Enum16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16AsStringColumn, manyTypes.FindProperty("Enum16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16AsStringArrayColumn, manyTypes.FindProperty("Enum16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16AsStringCollectionColumn, manyTypes.FindProperty("Enum16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16CollectionColumn, manyTypes.FindProperty("Enum16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32Column, manyTypes.FindProperty("Enum32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32ArrayColumn, manyTypes.FindProperty("Enum32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32AsStringColumn, manyTypes.FindProperty("Enum32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32AsStringArrayColumn, manyTypes.FindProperty("Enum32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32AsStringCollectionColumn, manyTypes.FindProperty("Enum32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32CollectionColumn, manyTypes.FindProperty("Enum32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64Column, manyTypes.FindProperty("Enum64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64ArrayColumn, manyTypes.FindProperty("Enum64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64AsStringColumn, manyTypes.FindProperty("Enum64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64AsStringArrayColumn, manyTypes.FindProperty("Enum64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64AsStringCollectionColumn, manyTypes.FindProperty("Enum64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64CollectionColumn, manyTypes.FindProperty("Enum64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8Column, manyTypes.FindProperty("Enum8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8ArrayColumn, manyTypes.FindProperty("Enum8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8AsStringColumn, manyTypes.FindProperty("Enum8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8AsStringArrayColumn, manyTypes.FindProperty("Enum8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8AsStringCollectionColumn, manyTypes.FindProperty("Enum8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8CollectionColumn, manyTypes.FindProperty("Enum8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumToNumberConverterPropertyColumn, manyTypes.FindProperty("EnumToNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumToStringConverterPropertyColumn, manyTypes.FindProperty("EnumToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16Column, manyTypes.FindProperty("EnumU16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16ArrayColumn, manyTypes.FindProperty("EnumU16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16AsStringColumn, manyTypes.FindProperty("EnumU16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16AsStringArrayColumn, manyTypes.FindProperty("EnumU16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16AsStringCollectionColumn, manyTypes.FindProperty("EnumU16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16CollectionColumn, manyTypes.FindProperty("EnumU16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32Column, manyTypes.FindProperty("EnumU32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32ArrayColumn, manyTypes.FindProperty("EnumU32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32AsStringColumn, manyTypes.FindProperty("EnumU32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32AsStringArrayColumn, manyTypes.FindProperty("EnumU32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32AsStringCollectionColumn, manyTypes.FindProperty("EnumU32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32CollectionColumn, manyTypes.FindProperty("EnumU32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64Column, manyTypes.FindProperty("EnumU64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64ArrayColumn, manyTypes.FindProperty("EnumU64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64AsStringColumn, manyTypes.FindProperty("EnumU64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64AsStringArrayColumn, manyTypes.FindProperty("EnumU64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64AsStringCollectionColumn, manyTypes.FindProperty("EnumU64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64CollectionColumn, manyTypes.FindProperty("EnumU64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8Column, manyTypes.FindProperty("EnumU8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8ArrayColumn, manyTypes.FindProperty("EnumU8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8AsStringColumn, manyTypes.FindProperty("EnumU8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8AsStringArrayColumn, manyTypes.FindProperty("EnumU8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8AsStringCollectionColumn, manyTypes.FindProperty("EnumU8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8CollectionColumn, manyTypes.FindProperty("EnumU8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(floatColumn, manyTypes.FindProperty("Float")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(floatArrayColumn, manyTypes.FindProperty("FloatArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidColumn, manyTypes.FindProperty("Guid")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidArrayColumn, manyTypes.FindProperty("GuidArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidToBytesConverterPropertyColumn, manyTypes.FindProperty("GuidToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidToStringConverterPropertyColumn, manyTypes.FindProperty("GuidToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressColumn, manyTypes.FindProperty("IPAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressArrayColumn, manyTypes.FindProperty("IPAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressReadOnlyCollectionColumn, manyTypes.FindProperty("IPAddressReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressToBytesConverterPropertyColumn, manyTypes.FindProperty("IPAddressToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressToStringConverterPropertyColumn, manyTypes.FindProperty("IPAddressToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int16Column, manyTypes.FindProperty("Int16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int16ArrayColumn, manyTypes.FindProperty("Int16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int32Column, manyTypes.FindProperty("Int32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int32ArrayColumn, manyTypes.FindProperty("Int32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int32ReadOnlyCollectionColumn, manyTypes.FindProperty("Int32ReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int64Column, manyTypes.FindProperty("Int64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int64ArrayColumn, manyTypes.FindProperty("Int64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int8Column, manyTypes.FindProperty("Int8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int8ArrayColumn, manyTypes.FindProperty("Int8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(intNumberToBytesConverterPropertyColumn, manyTypes.FindProperty("IntNumberToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(intNumberToStringConverterPropertyColumn, manyTypes.FindProperty("IntNumberToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullIntToNullStringConverterPropertyColumn, manyTypes.FindProperty("NullIntToNullStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBoolColumn, manyTypes.FindProperty("NullableBool")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBoolArrayColumn, manyTypes.FindProperty("NullableBoolArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBytesColumn, manyTypes.FindProperty("NullableBytes")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBytesArrayColumn, manyTypes.FindProperty("NullableBytesArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableCharColumn, manyTypes.FindProperty("NullableChar")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableCharArrayColumn, manyTypes.FindProperty("NullableCharArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateOnlyColumn, manyTypes.FindProperty("NullableDateOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateOnlyArrayColumn, manyTypes.FindProperty("NullableDateOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateTimeColumn, manyTypes.FindProperty("NullableDateTime")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateTimeArrayColumn, manyTypes.FindProperty("NullableDateTimeArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDecimalColumn, manyTypes.FindProperty("NullableDecimal")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDecimalArrayColumn, manyTypes.FindProperty("NullableDecimalArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDoubleColumn, manyTypes.FindProperty("NullableDouble")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDoubleArrayColumn, manyTypes.FindProperty("NullableDoubleArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16Column, manyTypes.FindProperty("NullableEnum16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16ArrayColumn, manyTypes.FindProperty("NullableEnum16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16AsStringColumn, manyTypes.FindProperty("NullableEnum16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16AsStringArrayColumn, manyTypes.FindProperty("NullableEnum16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16CollectionColumn, manyTypes.FindProperty("NullableEnum16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32Column, manyTypes.FindProperty("NullableEnum32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32ArrayColumn, manyTypes.FindProperty("NullableEnum32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32AsStringColumn, manyTypes.FindProperty("NullableEnum32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32AsStringArrayColumn, manyTypes.FindProperty("NullableEnum32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32CollectionColumn, manyTypes.FindProperty("NullableEnum32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64Column, manyTypes.FindProperty("NullableEnum64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64ArrayColumn, manyTypes.FindProperty("NullableEnum64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64AsStringColumn, manyTypes.FindProperty("NullableEnum64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64AsStringArrayColumn, manyTypes.FindProperty("NullableEnum64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64CollectionColumn, manyTypes.FindProperty("NullableEnum64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8Column, manyTypes.FindProperty("NullableEnum8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8ArrayColumn, manyTypes.FindProperty("NullableEnum8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8AsStringColumn, manyTypes.FindProperty("NullableEnum8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8AsStringArrayColumn, manyTypes.FindProperty("NullableEnum8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8CollectionColumn, manyTypes.FindProperty("NullableEnum8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16Column, manyTypes.FindProperty("NullableEnumU16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16ArrayColumn, manyTypes.FindProperty("NullableEnumU16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16AsStringColumn, manyTypes.FindProperty("NullableEnumU16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16CollectionColumn, manyTypes.FindProperty("NullableEnumU16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32Column, manyTypes.FindProperty("NullableEnumU32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32ArrayColumn, manyTypes.FindProperty("NullableEnumU32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32AsStringColumn, manyTypes.FindProperty("NullableEnumU32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32CollectionColumn, manyTypes.FindProperty("NullableEnumU32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64Column, manyTypes.FindProperty("NullableEnumU64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64ArrayColumn, manyTypes.FindProperty("NullableEnumU64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64AsStringColumn, manyTypes.FindProperty("NullableEnumU64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64CollectionColumn, manyTypes.FindProperty("NullableEnumU64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8Column, manyTypes.FindProperty("NullableEnumU8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8ArrayColumn, manyTypes.FindProperty("NullableEnumU8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8AsStringColumn, manyTypes.FindProperty("NullableEnumU8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8CollectionColumn, manyTypes.FindProperty("NullableEnumU8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableFloatColumn, manyTypes.FindProperty("NullableFloat")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableFloatArrayColumn, manyTypes.FindProperty("NullableFloatArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableGuidColumn, manyTypes.FindProperty("NullableGuid")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableGuidArrayColumn, manyTypes.FindProperty("NullableGuidArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableIPAddressColumn, manyTypes.FindProperty("NullableIPAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableIPAddressArrayColumn, manyTypes.FindProperty("NullableIPAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt16Column, manyTypes.FindProperty("NullableInt16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt16ArrayColumn, manyTypes.FindProperty("NullableInt16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt32Column, manyTypes.FindProperty("NullableInt32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt32ArrayColumn, manyTypes.FindProperty("NullableInt32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt64Column, manyTypes.FindProperty("NullableInt64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt64ArrayColumn, manyTypes.FindProperty("NullableInt64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt8Column, manyTypes.FindProperty("NullableInt8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt8ArrayColumn, manyTypes.FindProperty("NullableInt8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullablePhysicalAddressColumn, manyTypes.FindProperty("NullablePhysicalAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullablePhysicalAddressArrayColumn, manyTypes.FindProperty("NullablePhysicalAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableStringColumn, manyTypes.FindProperty("NullableString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableStringArrayColumn, manyTypes.FindProperty("NullableStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeOnlyColumn, manyTypes.FindProperty("NullableTimeOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeOnlyArrayColumn, manyTypes.FindProperty("NullableTimeOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeSpanColumn, manyTypes.FindProperty("NullableTimeSpan")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeSpanArrayColumn, manyTypes.FindProperty("NullableTimeSpanArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt16Column, manyTypes.FindProperty("NullableUInt16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt16ArrayColumn, manyTypes.FindProperty("NullableUInt16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt32Column, manyTypes.FindProperty("NullableUInt32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt32ArrayColumn, manyTypes.FindProperty("NullableUInt32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt64Column, manyTypes.FindProperty("NullableUInt64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt64ArrayColumn, manyTypes.FindProperty("NullableUInt64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt8Column, manyTypes.FindProperty("NullableUInt8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt8ArrayColumn, manyTypes.FindProperty("NullableUInt8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUriColumn, manyTypes.FindProperty("NullableUri")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUriArrayColumn, manyTypes.FindProperty("NullableUriArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressColumn, manyTypes.FindProperty("PhysicalAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressArrayColumn, manyTypes.FindProperty("PhysicalAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressToBytesConverterPropertyColumn, manyTypes.FindProperty("PhysicalAddressToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressToStringConverterPropertyColumn, manyTypes.FindProperty("PhysicalAddressToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringColumn, manyTypes.FindProperty("String")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringArrayColumn, manyTypes.FindProperty("StringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringReadOnlyCollectionColumn, manyTypes.FindProperty("StringReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToBoolConverterPropertyColumn, manyTypes.FindProperty("StringToBoolConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToBytesConverterPropertyColumn, manyTypes.FindProperty("StringToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToCharConverterPropertyColumn, manyTypes.FindProperty("StringToCharConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDateOnlyConverterPropertyColumn, manyTypes.FindProperty("StringToDateOnlyConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDateTimeConverterPropertyColumn, manyTypes.FindProperty("StringToDateTimeConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDateTimeOffsetConverterPropertyColumn, manyTypes.FindProperty("StringToDateTimeOffsetConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDecimalNumberConverterPropertyColumn, manyTypes.FindProperty("StringToDecimalNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDoubleNumberConverterPropertyColumn, manyTypes.FindProperty("StringToDoubleNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToEnumConverterPropertyColumn, manyTypes.FindProperty("StringToEnumConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToGuidConverterPropertyColumn, manyTypes.FindProperty("StringToGuidConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToIntNumberConverterPropertyColumn, manyTypes.FindProperty("StringToIntNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToTimeOnlyConverterPropertyColumn, manyTypes.FindProperty("StringToTimeOnlyConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToTimeSpanConverterPropertyColumn, manyTypes.FindProperty("StringToTimeSpanConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToUriConverterPropertyColumn, manyTypes.FindProperty("StringToUriConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyColumn, manyTypes.FindProperty("TimeOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyArrayColumn, manyTypes.FindProperty("TimeOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyToStringConverterPropertyColumn, manyTypes.FindProperty("TimeOnlyToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyToTicksConverterPropertyColumn, manyTypes.FindProperty("TimeOnlyToTicksConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanColumn, manyTypes.FindProperty("TimeSpan")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanArrayColumn, manyTypes.FindProperty("TimeSpanArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanToStringConverterPropertyColumn, manyTypes.FindProperty("TimeSpanToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanToTicksConverterPropertyColumn, manyTypes.FindProperty("TimeSpanToTicksConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt16Column, manyTypes.FindProperty("UInt16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt16ArrayColumn, manyTypes.FindProperty("UInt16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt32Column, manyTypes.FindProperty("UInt32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt32ArrayColumn, manyTypes.FindProperty("UInt32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt64Column, manyTypes.FindProperty("UInt64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt64ArrayColumn, manyTypes.FindProperty("UInt64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt8Column, manyTypes.FindProperty("UInt8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt8ArrayColumn, manyTypes.FindProperty("UInt8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt8ReadOnlyCollectionColumn, manyTypes.FindProperty("UInt8ReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uriColumn, manyTypes.FindProperty("Uri")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uriArrayColumn, manyTypes.FindProperty("UriArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uriToStringConverterPropertyColumn, manyTypes.FindProperty("UriToStringConverterProperty")!, manyTypesTableMapping);
+            var pK_ManyTypes = new UniqueConstraint("PK_ManyTypes", manyTypesTable, new[] { idColumn0 });
+            manyTypesTable.PrimaryKey = pK_ManyTypes;
+            pK_ManyTypes.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<int>(pK_ManyTypes));
+            var pK_ManyTypesKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes",
+                new[] { "Id" });
+            pK_ManyTypes.MappedKeys.Add(pK_ManyTypesKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_ManyTypesKey).Add(pK_ManyTypes);
+            manyTypesTable.UniqueConstraints.Add("PK_ManyTypes", pK_ManyTypes);
+
+            var principalBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase")!;
+
+            var defaultTableMappings2 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings2);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", null, relationalModel);
+            var alternateIdColumnBase = new ColumnBase<ColumnMappingBase>("AlternateId", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("AlternateId", alternateIdColumnBase);
+            var detailsColumnBase = new ColumnBase<ColumnMappingBase>("Details", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Details", detailsColumnBase);
+            var enum1ColumnBase = new ColumnBase<ColumnMappingBase>("Enum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum1", enum1ColumnBase);
+            var enum2ColumnBase = new ColumnBase<ColumnMappingBase>("Enum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum2", enum2ColumnBase);
+            var flagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum1", flagsEnum1ColumnBase);
+            var flagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum2", flagsEnum2ColumnBase);
+            var idColumnBase1 = new ColumnBase<ColumnMappingBase>("Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Id", idColumnBase1);
+            var numberColumnBase = new ColumnBase<ColumnMappingBase>("Number", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Number", numberColumnBase);
+            var principalBaseAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalBaseAlternateId", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("PrincipalBaseAlternateId", principalBaseAlternateIdColumnBase);
+            var principalBaseIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalBaseId", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("PrincipalBaseId", principalBaseIdColumnBase);
+            var refTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase);
+            var refTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase);
+            var refTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase);
+            var refTypeListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeList", refTypeListColumnBase);
+            var valueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase);
+            var valueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase);
+            var valueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase);
+            var valueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase = new TableMappingBase<ColumnMappingBase>(principalBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase, false);
+            defaultTableMappings2.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)alternateIdColumnBase, principalBase.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase1, principalBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalBase.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalBase.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalBase.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalBase.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalBase.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalBase.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalBase.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalBase.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalBase.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalBase.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalBase.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalBase.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+
+            var tableMappings2 = new List<TableMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings2);
+            var principalBaseTable = new Table("PrincipalBase", "mySchema", relationalModel);
+            var idColumn1 = new Column("Id", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("Id", idColumn1);
+            idColumn1.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(idColumn1);
+            idColumn1.AddAnnotation("Jet:Identity", "2, 3");
+            var alternateIdColumn = new Column("AlternateId", "uniqueidentifier", principalBaseTable);
+            principalBaseTable.Columns.Add("AlternateId", alternateIdColumn);
+            alternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(alternateIdColumn);
+            var enum1Column = new Column("Enum1", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("Enum1", enum1Column);
+            enum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum1Column);
+            var enum2Column = new Column("Enum2", "integer", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Enum2", enum2Column);
+            enum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum2Column);
+            var flagsEnum1Column = new Column("FlagsEnum1", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum1", flagsEnum1Column);
+            flagsEnum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum1Column);
+            var flagsEnum2Column = new Column("FlagsEnum2", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum2", flagsEnum2Column);
+            flagsEnum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum2Column);
+            var owned_NumberColumn = new Column("Owned_Number", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("Owned_Number", owned_NumberColumn);
+            owned_NumberColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(owned_NumberColumn);
+            var owned_RefTypeArrayColumn = new Column("Owned_RefTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeArray", owned_RefTypeArrayColumn);
+            owned_RefTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_RefTypeArrayColumn);
+            var owned_RefTypeEnumerableColumn = new Column("Owned_RefTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeEnumerable", owned_RefTypeEnumerableColumn);
+            owned_RefTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_RefTypeEnumerableColumn);
+            var owned_RefTypeIListColumn = new Column("Owned_RefTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeIList", owned_RefTypeIListColumn);
+            owned_RefTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_RefTypeIListColumn);
+            var owned_RefTypeListColumn = new Column("Owned_RefTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeList", owned_RefTypeListColumn);
+            owned_RefTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_RefTypeListColumn);
+            var owned_ValueTypeArrayColumn = new Column("Owned_ValueTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeArray", owned_ValueTypeArrayColumn);
+            owned_ValueTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_ValueTypeArrayColumn);
+            var owned_ValueTypeEnumerableColumn = new Column("Owned_ValueTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeEnumerable", owned_ValueTypeEnumerableColumn);
+            owned_ValueTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_ValueTypeEnumerableColumn);
+            var owned_ValueTypeIListColumn = new Column("Owned_ValueTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeIList", owned_ValueTypeIListColumn);
+            owned_ValueTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_ValueTypeIListColumn);
+            var owned_ValueTypeListColumn = new Column("Owned_ValueTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeList", owned_ValueTypeListColumn);
+            owned_ValueTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_ValueTypeListColumn);
+            var refTypeArrayColumn = new Column("RefTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeArray", refTypeArrayColumn);
+            refTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeArrayColumn);
+            var refTypeEnumerableColumn = new Column("RefTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn);
+            refTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeEnumerableColumn);
+            var refTypeIListColumn = new Column("RefTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeIList", refTypeIListColumn);
+            refTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeIListColumn);
+            var refTypeListColumn = new Column("RefTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeList", refTypeListColumn);
+            refTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeListColumn);
+            var valueTypeArrayColumn = new Column("ValueTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn);
+            valueTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeArrayColumn);
+            var valueTypeEnumerableColumn = new Column("ValueTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn);
+            valueTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeEnumerableColumn);
+            var valueTypeIListColumn = new Column("ValueTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeIList", valueTypeIListColumn);
+            valueTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeIListColumn);
+            var valueTypeListColumn = new Column("ValueTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeList", valueTypeListColumn);
+            valueTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeListColumn);
+            relationalModel.Tables.Add(("PrincipalBase", "mySchema"), principalBaseTable);
+            var principalBaseTableMapping = new TableMapping(principalBase, principalBaseTable, true)
+            {
+                IsSharedTablePrincipal = true,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping, false);
+            tableMappings2.Add(principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(alternateIdColumn, principalBase.FindProperty("AlternateId")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn1, principalBase.FindProperty("Id")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum1Column, principalBase.FindProperty("Enum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum2Column, principalBase.FindProperty("Enum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalBase.FindProperty("FlagsEnum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalBase.FindProperty("FlagsEnum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalBase.FindProperty("RefTypeList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseTableMapping);
+
+            var ownedType = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType")!;
+
+            var defaultTableMappings3 = new List<TableMappingBase<ColumnMappingBase>>();
+            ownedType.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings3);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0 = new TableMappingBase<ColumnMappingBase>(ownedType, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0, false);
+            defaultTableMappings3.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseAlternateIdColumnBase, ownedType.FindProperty("PrincipalBaseAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase, ownedType.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)detailsColumnBase, ownedType.FindProperty("Details")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)numberColumnBase, ownedType.FindProperty("Number")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, ownedType.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, ownedType.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, ownedType.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, ownedType.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, ownedType.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, ownedType.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, ownedType.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, ownedType.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+
+            var tableMappings3 = new List<TableMapping>();
+            ownedType.SetRuntimeAnnotation("Relational:TableMappings", tableMappings3);
+            var principalBaseTableMapping0 = new TableMapping(ownedType, principalBaseTable, null)
+            {
+                IsSharedTablePrincipal = false,
+                IsSplitEntityTypePrincipal = true
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping0, false);
+            tableMappings3.Add(principalBaseTableMapping0);
+            principalBaseTable.AddRowInternalForeignKey(ownedType, RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" }));
+            RelationalModel.CreateColumnMapping(alternateIdColumn, ownedType.FindProperty("PrincipalBaseAlternateId")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(idColumn1, ownedType.FindProperty("PrincipalBaseId")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_NumberColumn, ownedType.FindProperty("Number")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeArrayColumn, ownedType.FindProperty("RefTypeArray")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeEnumerableColumn, ownedType.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeIListColumn, ownedType.FindProperty("RefTypeIList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeListColumn, ownedType.FindProperty("RefTypeList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeArrayColumn, ownedType.FindProperty("ValueTypeArray")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeEnumerableColumn, ownedType.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeIListColumn, ownedType.FindProperty("ValueTypeIList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeListColumn, ownedType.FindProperty("ValueTypeList")!, principalBaseTableMapping0);
+            var detailsTable = new Table("Details", null, relationalModel);
+            var principalBaseIdColumn = new Column("PrincipalBaseId", "integer", detailsTable);
+            detailsTable.Columns.Add("PrincipalBaseId", principalBaseIdColumn);
+            principalBaseIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(principalBaseIdColumn);
+            var principalBaseAlternateIdColumn = new Column("PrincipalBaseAlternateId", "uniqueidentifier", detailsTable);
+            detailsTable.Columns.Add("PrincipalBaseAlternateId", principalBaseAlternateIdColumn);
+            principalBaseAlternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(principalBaseAlternateIdColumn);
+            var detailsColumn = new Column("Details", "varchar(255)", detailsTable)
+            {
+                IsNullable = true
+            };
+            detailsTable.Columns.Add("Details", detailsColumn);
+            detailsColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(detailsColumn);
+            relationalModel.Tables.Add(("Details", null), detailsTable);
+            var detailsTableMapping = new TableMapping(ownedType, detailsTable, null)
+            {
+                IsSplitEntityTypePrincipal = false
+            };
+            detailsTable.AddTypeMapping(detailsTableMapping, false);
+            tableMappings3.Add(detailsTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseAlternateIdColumn, ownedType.FindProperty("PrincipalBaseAlternateId")!, detailsTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn, ownedType.FindProperty("PrincipalBaseId")!, detailsTableMapping);
+            RelationalModel.CreateColumnMapping(detailsColumn, ownedType.FindProperty("Details")!, detailsTableMapping);
+            var pK_Details = new UniqueConstraint("PK_Details", detailsTable, new[] { principalBaseIdColumn, principalBaseAlternateIdColumn });
+            detailsTable.PrimaryKey = pK_Details;
+            pK_Details.SetRowKeyValueFactory(new CompositeRowKeyValueFactory(pK_Details));
+            var pK_DetailsKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" });
+            pK_Details.MappedKeys.Add(pK_DetailsKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DetailsKey).Add(pK_Details);
+            detailsTable.UniqueConstraints.Add("PK_Details", pK_Details);
+
+            var principalDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>")!;
+
+            var defaultTableMappings4 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings4);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1 = new TableMappingBase<ColumnMappingBase>(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1, false);
+            defaultTableMappings4.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)alternateIdColumnBase, principalDerived.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase1, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalDerived.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalDerived.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalDerived.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalDerived.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalDerived.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalDerived.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalDerived.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalDerived.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalDerived.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalDerived.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalDerived.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalDerived.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>", null, relationalModel);
+            var alternateIdColumnBase0 = new ColumnBase<ColumnMappingBase>("AlternateId", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("AlternateId", alternateIdColumnBase0);
+            var idColumnBase2 = new ColumnBase<ColumnMappingBase>("Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Id", idColumnBase2);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase, false);
+            defaultTableMappings4.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)alternateIdColumnBase0, principalDerived.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase2, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+
+            var tableMappings4 = new List<TableMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings4);
+            var principalBaseTableMapping1 = new TableMapping(principalDerived, principalBaseTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping1, false);
+            tableMappings4.Add(principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(alternateIdColumn, principalDerived.FindProperty("AlternateId")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(idColumn1, principalDerived.FindProperty("Id")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(enum1Column, principalDerived.FindProperty("Enum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(enum2Column, principalDerived.FindProperty("Enum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalDerived.FindProperty("FlagsEnum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalDerived.FindProperty("FlagsEnum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalDerived.FindProperty("RefTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalDerived.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalDerived.FindProperty("RefTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalDerived.FindProperty("RefTypeList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalDerived.FindProperty("ValueTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalDerived.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalDerived.FindProperty("ValueTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalDerived.FindProperty("ValueTypeList")!, principalBaseTableMapping1);
+            var aK_PrincipalBase_Id = new UniqueConstraint("AK_PrincipalBase_Id", principalBaseTable, new[] { idColumn1 });
+            aK_PrincipalBase_Id.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<int>(aK_PrincipalBase_Id));
+            var aK_PrincipalBase_IdKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            aK_PrincipalBase_Id.MappedKeys.Add(aK_PrincipalBase_IdKey);
+            RelationalModel.GetOrCreateUniqueConstraints(aK_PrincipalBase_IdKey).Add(aK_PrincipalBase_Id);
+            principalBaseTable.UniqueConstraints.Add("AK_PrincipalBase_Id", aK_PrincipalBase_Id);
+            var pK = new UniqueConstraint("PK", principalBaseTable, new[] { idColumn1, alternateIdColumn });
+            principalBaseTable.PrimaryKey = pK;
+            pK.SetRowKeyValueFactory(new CompositeRowKeyValueFactory(pK));
+            var pKKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" });
+            pK.MappedKeys.Add(pKKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pKKey).Add(pK);
+            pK.MappedKeys.Add(pK_DetailsKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DetailsKey).Add(pK);
+            principalBaseTable.UniqueConstraints.Add("PK", pK);
+            var iX_PrincipalBase_AlternateId_Id = new TableIndex(
+            "IX_PrincipalBase_AlternateId_Id", principalBaseTable, new[] { alternateIdColumn, idColumn1 }, false);
+            iX_PrincipalBase_AlternateId_Id.SetRowIndexValueFactory(new CompositeRowIndexValueFactory(iX_PrincipalBase_AlternateId_Id));
+            var iX_PrincipalBase_AlternateId_IdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "AlternateId", "Id" });
+            iX_PrincipalBase_AlternateId_Id.MappedIndexes.Add(iX_PrincipalBase_AlternateId_IdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBase_AlternateId_IdIx).Add(iX_PrincipalBase_AlternateId_Id);
+            principalBaseTable.Indexes.Add("IX_PrincipalBase_AlternateId_Id", iX_PrincipalBase_AlternateId_Id);
+            var principalDerivedTable = new Table("PrincipalDerived", null, relationalModel);
+            var derivedIdColumn = new Column("DerivedId", "integer", principalDerivedTable);
+            principalDerivedTable.Columns.Add("DerivedId", derivedIdColumn);
+            derivedIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(derivedIdColumn);
+            var alternateIdColumn0 = new Column("AlternateId", "uniqueidentifier", principalDerivedTable);
+            principalDerivedTable.Columns.Add("AlternateId", alternateIdColumn0);
+            alternateIdColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(alternateIdColumn0);
+            relationalModel.Tables.Add(("PrincipalDerived", null), principalDerivedTable);
+            var principalDerivedTableMapping = new TableMapping(principalDerived, principalDerivedTable, null);
+            principalDerivedTable.AddTypeMapping(principalDerivedTableMapping, false);
+            tableMappings4.Add(principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(alternateIdColumn0, principalDerived.FindProperty("AlternateId")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(derivedIdColumn, principalDerived.FindProperty("Id")!, principalDerivedTableMapping);
+            var aK_PrincipalDerived_DerivedId = new UniqueConstraint("AK_PrincipalDerived_DerivedId", principalDerivedTable, new[] { derivedIdColumn });
+            aK_PrincipalDerived_DerivedId.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<int>(aK_PrincipalDerived_DerivedId));
+            aK_PrincipalDerived_DerivedId.MappedKeys.Add(aK_PrincipalBase_IdKey);
+            RelationalModel.GetOrCreateUniqueConstraints(aK_PrincipalBase_IdKey).Add(aK_PrincipalDerived_DerivedId);
+            principalDerivedTable.UniqueConstraints.Add("AK_PrincipalDerived_DerivedId", aK_PrincipalDerived_DerivedId);
+            var pK0 = new UniqueConstraint("PK", principalDerivedTable, new[] { derivedIdColumn, alternateIdColumn0 });
+            principalDerivedTable.PrimaryKey = pK0;
+            pK0.SetRowKeyValueFactory(new CompositeRowKeyValueFactory(pK0));
+            pK0.MappedKeys.Add(pKKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pKKey).Add(pK0);
+            principalDerivedTable.UniqueConstraints.Add("PK", pK0);
+            var iX_PrincipalDerived_AlternateId_DerivedId = new TableIndex(
+            "IX_PrincipalDerived_AlternateId_DerivedId", principalDerivedTable, new[] { alternateIdColumn0, derivedIdColumn }, false);
+            iX_PrincipalDerived_AlternateId_DerivedId.SetRowIndexValueFactory(new CompositeRowIndexValueFactory(iX_PrincipalDerived_AlternateId_DerivedId));
+            iX_PrincipalDerived_AlternateId_DerivedId.MappedIndexes.Add(iX_PrincipalBase_AlternateId_IdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBase_AlternateId_IdIx).Add(iX_PrincipalDerived_AlternateId_DerivedId);
+            principalDerivedTable.Indexes.Add("IX_PrincipalDerived_AlternateId_DerivedId", iX_PrincipalDerived_AlternateId_DerivedId);
+
+            var ownedType0 = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType")!;
+
+            var defaultTableMappings5 = new List<TableMappingBase<ColumnMappingBase>>();
+            ownedType0.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings5);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType", null, relationalModel);
+            var detailsColumnBase0 = new ColumnBase<ColumnMappingBase>("Details", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("Details", detailsColumnBase0);
+            var idColumnBase3 = new ColumnBase<ColumnMappingBase>("Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("Id", idColumnBase3);
+            var numberColumnBase0 = new ColumnBase<ColumnMappingBase>("Number", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("Number", numberColumnBase0);
+            var principalDerivedDependentBasebyteAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalDerived<DependentBase<byte?>>AlternateId", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("PrincipalDerived<DependentBase<byte?>>AlternateId", principalDerivedDependentBasebyteAlternateIdColumnBase);
+            var principalDerivedDependentBasebyteIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalDerived<DependentBase<byte?>>Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumnBase);
+            var refTypeArrayColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase0);
+            var refTypeEnumerableColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase0);
+            var refTypeIListColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase0);
+            var refTypeListColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("RefTypeList", refTypeListColumnBase0);
+            var valueTypeArrayColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase0);
+            var valueTypeEnumerableColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase0);
+            var valueTypeIListColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase0);
+            var valueTypeListColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase0);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase = new TableMappingBase<ColumnMappingBase>(ownedType0, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase, false);
+            defaultTableMappings5.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase3, ownedType0.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalDerivedDependentBasebyteAlternateIdColumnBase, ownedType0.FindProperty("PrincipalDerivedAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalDerivedDependentBasebyteIdColumnBase, ownedType0.FindProperty("PrincipalDerivedId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)detailsColumnBase0, ownedType0.FindProperty("Details")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)numberColumnBase0, ownedType0.FindProperty("Number")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase0, ownedType0.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase0, ownedType0.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase0, ownedType0.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase0, ownedType0.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase0, ownedType0.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase0, ownedType0.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase0, ownedType0.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase0, ownedType0.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+
+            var tableMappings5 = new List<TableMapping>();
+            ownedType0.SetRuntimeAnnotation("Relational:TableMappings", tableMappings5);
+            var manyOwnedTable = new Table("ManyOwned", null, relationalModel);
+            var principalDerivedDependentBasebyteIdColumn = new Column("PrincipalDerived<DependentBase<byte?>>Id", "integer", manyOwnedTable);
+            manyOwnedTable.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumn);
+            principalDerivedDependentBasebyteIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(principalDerivedDependentBasebyteIdColumn);
+            var principalDerivedDependentBasebyteAlternateIdColumn = new Column("PrincipalDerived<DependentBase<byte?>>AlternateId", "uniqueidentifier", manyOwnedTable);
+            manyOwnedTable.Columns.Add("PrincipalDerived<DependentBase<byte?>>AlternateId", principalDerivedDependentBasebyteAlternateIdColumn);
+            principalDerivedDependentBasebyteAlternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(principalDerivedDependentBasebyteAlternateIdColumn);
+            var idColumn2 = new Column("Id", "integer", manyOwnedTable);
+            manyOwnedTable.Columns.Add("Id", idColumn2);
+            idColumn2.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(idColumn2);
+            idColumn2.AddAnnotation("Jet:Identity", "3, 2");
+            var detailsColumn0 = new Column("Details", "varchar(255)", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("Details", detailsColumn0);
+            detailsColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(detailsColumn0);
+            var numberColumn = new Column("Number", "integer", manyOwnedTable);
+            manyOwnedTable.Columns.Add("Number", numberColumn);
+            numberColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(numberColumn);
+            var refTypeArrayColumn0 = new Column("RefTypeArray", "varchar(255)", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("RefTypeArray", refTypeArrayColumn0);
+            refTypeArrayColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeArrayColumn0);
+            var refTypeEnumerableColumn0 = new Column("RefTypeEnumerable", "varchar(255)", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn0);
+            refTypeEnumerableColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeEnumerableColumn0);
+            var refTypeIListColumn0 = new Column("RefTypeIList", "varchar(255)", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("RefTypeIList", refTypeIListColumn0);
+            refTypeIListColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeIListColumn0);
+            var refTypeListColumn0 = new Column("RefTypeList", "varchar(255)", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("RefTypeList", refTypeListColumn0);
+            refTypeListColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeListColumn0);
+            var valueTypeArrayColumn0 = new Column("ValueTypeArray", "varchar(255)", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn0);
+            valueTypeArrayColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeArrayColumn0);
+            var valueTypeEnumerableColumn0 = new Column("ValueTypeEnumerable", "varchar(255)", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn0);
+            valueTypeEnumerableColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeEnumerableColumn0);
+            var valueTypeIListColumn0 = new Column("ValueTypeIList", "varchar(255)", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("ValueTypeIList", valueTypeIListColumn0);
+            valueTypeIListColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeIListColumn0);
+            var valueTypeListColumn0 = new Column("ValueTypeList", "varchar(255)", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("ValueTypeList", valueTypeListColumn0);
+            valueTypeListColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeListColumn0);
+            relationalModel.Tables.Add(("ManyOwned", null), manyOwnedTable);
+            var manyOwnedTableMapping = new TableMapping(ownedType0, manyOwnedTable, null);
+            manyOwnedTable.AddTypeMapping(manyOwnedTableMapping, false);
+            tableMappings5.Add(manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn2, ownedType0.FindProperty("Id")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(principalDerivedDependentBasebyteAlternateIdColumn, ownedType0.FindProperty("PrincipalDerivedAlternateId")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(principalDerivedDependentBasebyteIdColumn, ownedType0.FindProperty("PrincipalDerivedId")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(detailsColumn0, ownedType0.FindProperty("Details")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(numberColumn, ownedType0.FindProperty("Number")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn0, ownedType0.FindProperty("RefTypeArray")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn0, ownedType0.FindProperty("RefTypeEnumerable")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn0, ownedType0.FindProperty("RefTypeIList")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn0, ownedType0.FindProperty("RefTypeList")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn0, ownedType0.FindProperty("ValueTypeArray")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn0, ownedType0.FindProperty("ValueTypeEnumerable")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn0, ownedType0.FindProperty("ValueTypeIList")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn0, ownedType0.FindProperty("ValueTypeList")!, manyOwnedTableMapping);
+            var pK_ManyOwned = new UniqueConstraint("PK_ManyOwned", manyOwnedTable, new[] { principalDerivedDependentBasebyteIdColumn, principalDerivedDependentBasebyteAlternateIdColumn, idColumn2 });
+            manyOwnedTable.PrimaryKey = pK_ManyOwned;
+            pK_ManyOwned.SetRowKeyValueFactory(new CompositeRowKeyValueFactory(pK_ManyOwned));
+            var pK_ManyOwnedKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType",
+                new[] { "PrincipalDerivedId", "PrincipalDerivedAlternateId", "Id" });
+            pK_ManyOwned.MappedKeys.Add(pK_ManyOwnedKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_ManyOwnedKey).Add(pK_ManyOwned);
+            manyOwnedTable.UniqueConstraints.Add("PK_ManyOwned", pK_ManyOwned);
+
+            var principalBasePrincipalDerivedDependentBasebyte = FindEntityType("PrincipalBasePrincipalDerived<DependentBase<byte?>>")!;
+
+            var defaultTableMappings6 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBasePrincipalDerivedDependentBasebyte.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings6);
+            var principalBasePrincipalDerivedDependentBasebyteTableBase = new TableBase("PrincipalBasePrincipalDerived<DependentBase<byte?>>", null, relationalModel);
+            var derivedsAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("DerivedsAlternateId", "uniqueidentifier", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("DerivedsAlternateId", derivedsAlternateIdColumnBase);
+            var derivedsIdColumnBase = new ColumnBase<ColumnMappingBase>("DerivedsId", "integer", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("DerivedsId", derivedsIdColumnBase);
+            var principalsAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalsAlternateId", "uniqueidentifier", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("PrincipalsAlternateId", principalsAlternateIdColumnBase);
+            var principalsIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalsId", "integer", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("PrincipalsId", principalsIdColumnBase);
+            var rowidColumnBase = new ColumnBase<ColumnMappingBase>("rowid", "varbinary(8)", principalBasePrincipalDerivedDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("rowid", rowidColumnBase);
+            relationalModel.DefaultTables.Add("PrincipalBasePrincipalDerived<DependentBase<byte?>>", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            var principalBasePrincipalDerivedDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(principalBasePrincipalDerivedDependentBasebyte, principalBasePrincipalDerivedDependentBasebyteTableBase, null);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.AddTypeMapping(principalBasePrincipalDerivedDependentBasebyteMappingBase, false);
+            defaultTableMappings6.Add(principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)derivedsAlternateIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)derivedsIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalsAlternateIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalsIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)rowidColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("rowid")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+
+            var tableMappings6 = new List<TableMapping>();
+            principalBasePrincipalDerivedDependentBasebyte.SetRuntimeAnnotation("Relational:TableMappings", tableMappings6);
+            var principalBasePrincipalDerivedDependentBasebyteTable = new Table("PrincipalBasePrincipalDerived<DependentBase<byte?>>", null, relationalModel);
+            var derivedsIdColumn = new Column("DerivedsId", "integer", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("DerivedsId", derivedsIdColumn);
+            derivedsIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(derivedsIdColumn);
+            var derivedsAlternateIdColumn = new Column("DerivedsAlternateId", "uniqueidentifier", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("DerivedsAlternateId", derivedsAlternateIdColumn);
+            derivedsAlternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(derivedsAlternateIdColumn);
+            var principalsIdColumn = new Column("PrincipalsId", "integer", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("PrincipalsId", principalsIdColumn);
+            principalsIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(principalsIdColumn);
+            var principalsAlternateIdColumn = new Column("PrincipalsAlternateId", "uniqueidentifier", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("PrincipalsAlternateId", principalsAlternateIdColumn);
+            principalsAlternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(principalsAlternateIdColumn);
+            var rowidColumn = new Column("rowid", "varbinary(8)", principalBasePrincipalDerivedDependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("rowid", rowidColumn);
+            rowidColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(rowidColumn);
+            relationalModel.Tables.Add(("PrincipalBasePrincipalDerived<DependentBase<byte?>>", null), principalBasePrincipalDerivedDependentBasebyteTable);
+            var principalBasePrincipalDerivedDependentBasebyteTableMapping = new TableMapping(principalBasePrincipalDerivedDependentBasebyte, principalBasePrincipalDerivedDependentBasebyteTable, null);
+            principalBasePrincipalDerivedDependentBasebyteTable.AddTypeMapping(principalBasePrincipalDerivedDependentBasebyteTableMapping, false);
+            tableMappings6.Add(principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(derivedsAlternateIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(derivedsIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalsAlternateIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalsIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(rowidColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("rowid")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            var pK_PrincipalBasePrincipalDerivedDependentBasebyte = new UniqueConstraint("PK_PrincipalBasePrincipalDerived<DependentBase<byte?>>", principalBasePrincipalDerivedDependentBasebyteTable, new[] { derivedsIdColumn, derivedsAlternateIdColumn, principalsIdColumn, principalsAlternateIdColumn });
+            principalBasePrincipalDerivedDependentBasebyteTable.PrimaryKey = pK_PrincipalBasePrincipalDerivedDependentBasebyte;
+            pK_PrincipalBasePrincipalDerivedDependentBasebyte.SetRowKeyValueFactory(new CompositeRowKeyValueFactory(pK_PrincipalBasePrincipalDerivedDependentBasebyte));
+            var pK_PrincipalBasePrincipalDerivedDependentBasebyteKey = RelationalModel.GetKey(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "DerivedsId", "DerivedsAlternateId", "PrincipalsId", "PrincipalsAlternateId" });
+            pK_PrincipalBasePrincipalDerivedDependentBasebyte.MappedKeys.Add(pK_PrincipalBasePrincipalDerivedDependentBasebyteKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_PrincipalBasePrincipalDerivedDependentBasebyteKey).Add(pK_PrincipalBasePrincipalDerivedDependentBasebyte);
+            principalBasePrincipalDerivedDependentBasebyteTable.UniqueConstraints.Add("PK_PrincipalBasePrincipalDerived<DependentBase<byte?>>", pK_PrincipalBasePrincipalDerivedDependentBasebyte);
+            var iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa = new TableIndex(
+            "IX_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Principa~", principalBasePrincipalDerivedDependentBasebyteTable, new[] { principalsIdColumn, principalsAlternateIdColumn }, false);
+            iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.SetRowIndexValueFactory(new CompositeRowIndexValueFactory(iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa));
+            var iX_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaIx = RelationalModel.GetIndex(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "PrincipalsId", "PrincipalsAlternateId" });
+            iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.MappedIndexes.Add(iX_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaIx).Add(iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            principalBasePrincipalDerivedDependentBasebyteTable.Indexes.Add("IX_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Principa~", iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            var fK_DependentBasebyte_PrincipalBase_PrincipalId = new ForeignKeyConstraint(
+                "FK_DependentBase<byte?>_PrincipalBase_PrincipalId", dependentBasebyteTable, principalBaseTable,
+                new[] { principalIdColumn },
+                principalBaseTable.FindUniqueConstraint("AK_PrincipalBase_Id")!, ReferentialAction.Cascade);
+            fK_DependentBasebyte_PrincipalBase_PrincipalId.SetRowForeignKeyValueFactory(RowForeignKeyValueFactoryFactory.CreateSimpleNonNullableFactory<int, int>(fK_DependentBasebyte_PrincipalBase_PrincipalId));
+            var fK_DependentBasebyte_PrincipalBase_PrincipalIdFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            fK_DependentBasebyte_PrincipalBase_PrincipalId.MappedForeignKeys.Add(fK_DependentBasebyte_PrincipalBase_PrincipalIdFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_DependentBasebyte_PrincipalBase_PrincipalIdFk).Add(fK_DependentBasebyte_PrincipalBase_PrincipalId);
+            dependentBasebyteTable.ForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalBase_PrincipalId);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalBase_PrincipalId);
+            var fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA = new ForeignKeyConstraint(
+                "FK_DependentBase<byte?>_PrincipalDerived_PrincipalId_PrincipalA~", dependentBasebyteTable, principalDerivedTable,
+                new[] { principalIdColumn, principalAlternateIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK")!, ReferentialAction.NoAction);
+            fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA.SetRowForeignKeyValueFactory(new CompositeRowForeignKeyValueFactory(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA));
+            var fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalAFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId", "PrincipalAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" });
+            fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA.MappedForeignKeys.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalAFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalAFk).Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA);
+            dependentBasebyteTable.ForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA);
+            var fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate = new ForeignKeyConstraint(
+                "FK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate~", detailsTable, principalBaseTable,
+                new[] { principalBaseIdColumn, principalBaseAlternateIdColumn },
+                principalBaseTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate.SetRowForeignKeyValueFactory(new CompositeRowForeignKeyValueFactory(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate));
+            var fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternateFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" });
+            fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate.MappedForeignKeys.Add(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternateFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternateFk).Add(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate);
+            detailsTable.ForeignKeyConstraints.Add(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate);
+            var fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby = new ForeignKeyConstraint(
+                "FK_ManyOwned_PrincipalDerived_PrincipalDerived<DependentBase<by~", manyOwnedTable, principalDerivedTable,
+                new[] { principalDerivedDependentBasebyteIdColumn, principalDerivedDependentBasebyteAlternateIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby.SetRowForeignKeyValueFactory(new CompositeRowForeignKeyValueFactory(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby));
+            var fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBasebyFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType",
+                new[] { "PrincipalDerivedId", "PrincipalDerivedAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" });
+            fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby.MappedForeignKeys.Add(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBasebyFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBasebyFk).Add(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby);
+            manyOwnedTable.ForeignKeyConstraints.Add(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby);
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa = new ForeignKeyConstraint(
+                "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Principa~", principalBasePrincipalDerivedDependentBasebyteTable, principalDerivedTable,
+                new[] { derivedsIdColumn, derivedsAlternateIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.SetRowForeignKeyValueFactory(new CompositeRowForeignKeyValueFactory(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa));
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaFk = RelationalModel.GetForeignKey(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "DerivedsId", "DerivedsAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" });
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.MappedForeignKeys.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaFk).Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            principalBasePrincipalDerivedDependentBasebyteTable.ForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1 = new ForeignKeyConstraint(
+                "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Princip~1", principalBasePrincipalDerivedDependentBasebyteTable, principalBaseTable,
+                new[] { principalsIdColumn, principalsAlternateIdColumn },
+                principalBaseTable.FindUniqueConstraint("PK")!, ReferentialAction.NoAction);
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1.SetRowForeignKeyValueFactory(new CompositeRowForeignKeyValueFactory(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1));
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1Fk = RelationalModel.GetForeignKey(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "PrincipalsId", "PrincipalsAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" });
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1.MappedForeignKeys.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1Fk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1Fk).Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1);
+            principalBasePrincipalDerivedDependentBasebyteTable.ForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1);
+            var fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId = new ForeignKeyConstraint(
+                "FK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId", principalDerivedTable, principalBaseTable,
+                new[] { derivedIdColumn, alternateIdColumn0 },
+                principalBaseTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId.SetRowForeignKeyValueFactory(new CompositeRowForeignKeyValueFactory(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId));
+            var fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateIdFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" });
+            fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId.MappedForeignKeys.Add(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateIdFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateIdFk).Add(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId);
+            principalDerivedTable.ForeignKeyConstraints.Add(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseEntityType.cs
new file mode 100644
index 00000000..789da39f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseEntityType.cs
@@ -0,0 +1,354 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.ValueGeneration;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DependentBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                baseEntityType,
+                discriminatorProperty: "EnumDiscriminator",
+                discriminatorValue: CompiledModelTestBase.Enum1.One,
+                derivedTypesCount: 1,
+                propertyCount: 4,
+                navigationCount: 1,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var principalId = runtimeEntityType.AddProperty(
+                "PrincipalId",
+                typeof(long),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+            principalId.SetAccessors(
+                long (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<long>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<long>(0) == 0L ? entry.ReadTemporaryValue<long>(0) : entry.ReadShadowValue<long>(0))),
+                long (IInternalEntry entry) => entry.ReadShadowValue<long>(0),
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(principalId, 0),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(principalId, 0));
+            principalId.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: 0,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            principalId.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<long, int>(
+                    int (long v) => ((int)v),
+                    long (int v) => ((long)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<long, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<long, int>(
+                        int (long v) => ((int)v),
+                        long (int v) => ((long)v))));
+            principalId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(principalId));
+            principalId.SetSentinelFromProviderValue(0);
+
+            var principalAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalAlternateId",
+                typeof(Guid),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            principalAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<Guid>(1) : (entry.FlaggedAsTemporary(1) && entry.ReadShadowValue<Guid>(1) == new Guid("00000000-0000-0000-0000-000000000000") ? entry.ReadTemporaryValue<Guid>(1) : entry.ReadShadowValue<Guid>(1))),
+                Guid (IInternalEntry entry) => entry.ReadShadowValue<Guid>(1),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(principalAlternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(principalAlternateId, 1));
+            principalAlternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: 1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            principalAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            principalAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(principalAlternateId));
+
+            var enumDiscriminator = runtimeEntityType.AddProperty(
+                "EnumDiscriminator",
+                typeof(CompiledModelTestBase.Enum1),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                valueGeneratorFactory: new DiscriminatorValueGeneratorFactory().Create);
+            enumDiscriminator.SetAccessors(
+                CompiledModelTestBase.Enum1 (IInternalEntry entry) => entry.ReadShadowValue<CompiledModelTestBase.Enum1>(2),
+                CompiledModelTestBase.Enum1 (IInternalEntry entry) => entry.ReadShadowValue<CompiledModelTestBase.Enum1>(2),
+                CompiledModelTestBase.Enum1 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum1>(enumDiscriminator, 2),
+                CompiledModelTestBase.Enum1 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum1>(enumDiscriminator));
+            enumDiscriminator.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: 2,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumDiscriminator.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum1>(
+                    bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum1 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum1 (CompiledModelTestBase.Enum1 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum1>(
+                    bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum1 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum1 (CompiledModelTestBase.Enum1 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum1, int>(
+                    int (CompiledModelTestBase.Enum1 value) => ((int)value),
+                    CompiledModelTestBase.Enum1 (int value) => ((CompiledModelTestBase.Enum1)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum1, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum1, int>(
+                        int (CompiledModelTestBase.Enum1 value) => ((int)value),
+                        CompiledModelTestBase.Enum1 (int value) => ((CompiledModelTestBase.Enum1)value))));
+            enumDiscriminator.SetSentinelFromProviderValue(0);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Id", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            id.SetGetter(
+                byte? (CompiledModelTestBase.DependentBase<byte?> instance) => DependentBaseUnsafeAccessors<byte?>.Id(instance),
+                bool (CompiledModelTestBase.DependentBase<byte?> instance) => !(DependentBaseUnsafeAccessors<byte?>.Id(instance).HasValue));
+            id.SetSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, byte? value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, byte? value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                byte? (IInternalEntry entry) => entry.ReadOriginalValue<byte?>(id, 3),
+                byte? (IInternalEntry entry) => entry.GetCurrentValue<byte?>(id));
+            id.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            id.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                keyComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v));
+            id.SetComparer(new NullableValueComparer<byte>(id.TypeMapping.Comparer));
+            id.SetKeyComparer(new NullableValueComparer<byte>(id.TypeMapping.KeyComparer));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalId, principalAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalId },
+                unique: true);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId"), declaringEntityType.FindProperty("PrincipalAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.ClientNoAction,
+                unique: true,
+                required: true);
+
+            var principal = declaringEntityType.AddNavigation("Principal",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Principal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Principal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            principal.SetGetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.DependentBase<byte?> instance) => DependentBaseUnsafeAccessors<byte?>.Principal(instance),
+                bool (CompiledModelTestBase.DependentBase<byte?> instance) => DependentBaseUnsafeAccessors<byte?>.Principal(instance) == null);
+            principal.SetSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Principal(instance) = value;
+                    return instance;
+                });
+            principal.SetMaterializationSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Principal(instance) = value;
+                    return instance;
+                });
+            principal.SetAccessors(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                null,
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>>(principal));
+            principal.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 2,
+                storeGenerationIndex: -1);
+            var dependent = principalEntityType.AddNavigation("Dependent",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Dependent", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Dependent>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true,
+                lazyLoadingEnabled: false);
+
+            dependent.SetGetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance),
+                bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance) == null);
+            dependent.SetSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, CompiledModelTestBase.DependentBase<byte?> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance) = value;
+                    return instance;
+                });
+            dependent.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, CompiledModelTestBase.DependentBase<byte?> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance) = value;
+                    return instance;
+                });
+            dependent.SetAccessors(
+                CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                null,
+                CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.DependentBase<byte?>>(dependent));
+            dependent.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 4,
+                storeGenerationIndex: -1);
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var principalId = runtimeEntityType.FindProperty("PrincipalId");
+            var principalAlternateId = runtimeEntityType.FindProperty("PrincipalAlternateId");
+            var enumDiscriminator = runtimeEntityType.FindProperty("EnumDiscriminator");
+            var id = runtimeEntityType.FindProperty("Id");
+            var key = runtimeEntityType.FindKey(new[] { principalId, principalAlternateId });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key));
+            var principal = runtimeEntityType.FindNavigation("Principal");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.DependentBase<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1, byte?>(((ValueComparer<long>)(((IProperty)principalId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalId)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalAlternateId)), ((ValueComparer<CompiledModelTestBase.Enum1>)(((IProperty)enumDiscriminator).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum1>(enumDiscriminator)), (source.GetCurrentValue<byte?>(id) == null ? null : ((ValueComparer<byte?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<byte?>(id))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid>(((ValueComparer<long>)(((IProperty)principalId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetValueComparer())).Snapshot(default(Guid))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid>(default(long), default(Guid)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1>((source.ContainsKey("PrincipalId") ? ((long)(source["PrincipalId"])) : 0L), (source.ContainsKey("PrincipalAlternateId") ? ((Guid)(source["PrincipalAlternateId"])) : new Guid("00000000-0000-0000-0000-000000000000")), (source.ContainsKey("EnumDiscriminator") ? ((CompiledModelTestBase.Enum1)(source["EnumDiscriminator"])) : CompiledModelTestBase.Enum1.Default)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1>(default(long), default(Guid), default(CompiledModelTestBase.Enum1)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.DependentBase<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, object>(((ValueComparer<long>)(((IProperty)principalId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalId)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalAlternateId)), source.GetCurrentValue<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>>(principal))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 4,
+                navigationCount: 1,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 4,
+                shadowCount: 3,
+                relationshipCount: 3,
+                storeGeneratedCount: 2));
+            runtimeEntityType.AddAnnotation("DiscriminatorMappingComplete", false);
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPH");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseUnsafeAccessors.cs
new file mode 100644
index 00000000..d7a27e94
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseUnsafeAccessors.cs
@@ -0,0 +1,18 @@
+// <auto-generated />
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DependentBaseUnsafeAccessors<TKey>
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref TKey Id(CompiledModelTestBase.DependentBase<TKey> @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Principal>k__BackingField")]
+        public static extern ref CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<TKey>> Principal(CompiledModelTestBase.DependentBase<TKey> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs
new file mode 100644
index 00000000..720b15cb
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs
@@ -0,0 +1,174 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DependentDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<byte?>",
+                typeof(CompiledModelTestBase.DependentDerived<byte?>),
+                baseEntityType,
+                discriminatorProperty: "EnumDiscriminator",
+                discriminatorValue: CompiledModelTestBase.Enum1.Two,
+                propertyCount: 2);
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.DependentDerived<byte?>).GetProperty("Data", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentDerived<byte?>).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 20,
+                unicode: false);
+            data.SetGetter(
+                string (CompiledModelTestBase.DependentDerived<byte?> instance) => DependentDerivedUnsafeAccessors<byte?>.Data(instance),
+                bool (CompiledModelTestBase.DependentDerived<byte?> instance) => DependentDerivedUnsafeAccessors<byte?>.Data(instance) == null);
+            data.SetSetter(
+                CompiledModelTestBase.DependentDerived<byte?> (CompiledModelTestBase.DependentDerived<byte?> instance, string value) =>
+                {
+                    DependentDerivedUnsafeAccessors<byte?>.Data(instance) = value;
+                    return instance;
+                });
+            data.SetMaterializationSetter(
+                CompiledModelTestBase.DependentDerived<byte?> (CompiledModelTestBase.DependentDerived<byte?> instance, string value) =>
+                {
+                    DependentDerivedUnsafeAccessors<byte?>.Data(instance) = value;
+                    return instance;
+                });
+            data.SetAccessors(
+                string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<byte?>.Data(((CompiledModelTestBase.DependentDerived<byte?>)(entry.Entity))),
+                string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<byte?>.Data(((CompiledModelTestBase.DependentDerived<byte?>)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(data, 4),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(data));
+            data.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            data.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "char(20)",
+                    size: 20,
+                    unicode: false,
+                    fixedLength: true));
+            data.AddAnnotation("Relational:IsFixedLength", true);
+
+            var money = runtimeEntityType.AddProperty(
+                "Money",
+                typeof(decimal),
+                precision: 9,
+                scale: 3,
+                sentinel: 0m);
+            money.SetAccessors(
+                decimal (IInternalEntry entry) => entry.ReadShadowValue<decimal>(3),
+                decimal (IInternalEntry entry) => entry.ReadShadowValue<decimal>(3),
+                decimal (IInternalEntry entry) => entry.ReadOriginalValue<decimal>(money, 5),
+                decimal (IInternalEntry entry) => entry.GetCurrentValue<decimal>(money));
+            money.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: 3,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            money.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(9,3)",
+                    precision: 9,
+                    scale: 3));
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var principalId = runtimeEntityType.FindProperty("PrincipalId");
+            var principalAlternateId = runtimeEntityType.FindProperty("PrincipalAlternateId");
+            var enumDiscriminator = runtimeEntityType.FindProperty("EnumDiscriminator");
+            var id = runtimeEntityType.FindProperty("Id");
+            var data = runtimeEntityType.FindProperty("Data");
+            var money = runtimeEntityType.FindProperty("Money");
+            var principal = runtimeEntityType.FindNavigation("Principal");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.DependentDerived<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1, byte?, string, decimal>(((ValueComparer<long>)(((IProperty)principalId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalId)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalAlternateId)), ((ValueComparer<CompiledModelTestBase.Enum1>)(((IProperty)enumDiscriminator).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum1>(enumDiscriminator)), (source.GetCurrentValue<byte?>(id) == null ? null : ((ValueComparer<byte?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<byte?>(id))), (source.GetCurrentValue<string>(data) == null ? null : ((ValueComparer<string>)(((IProperty)data).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(data))), ((ValueComparer<decimal>)(((IProperty)money).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal>(money)))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid>(((ValueComparer<long>)(((IProperty)principalId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetValueComparer())).Snapshot(default(Guid))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid>(default(long), default(Guid)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1, decimal>((source.ContainsKey("PrincipalId") ? ((long)(source["PrincipalId"])) : 0L), (source.ContainsKey("PrincipalAlternateId") ? ((Guid)(source["PrincipalAlternateId"])) : new Guid("00000000-0000-0000-0000-000000000000")), (source.ContainsKey("EnumDiscriminator") ? ((CompiledModelTestBase.Enum1)(source["EnumDiscriminator"])) : CompiledModelTestBase.Enum1.Default), (source.ContainsKey("Money") ? ((decimal)(source["Money"])) : 0M)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1, decimal>(default(long), default(Guid), default(CompiledModelTestBase.Enum1), default(decimal)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.DependentDerived<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, object>(((ValueComparer<long>)(((IProperty)principalId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalId)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalAlternateId)), source.GetCurrentValue<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>>(principal))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 6,
+                navigationCount: 1,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 6,
+                shadowCount: 4,
+                relationshipCount: 3,
+                storeGeneratedCount: 2));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedUnsafeAccessors.cs
new file mode 100644
index 00000000..8847446b
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedUnsafeAccessors.cs
@@ -0,0 +1,16 @@
+// <auto-generated />
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DependentDerivedUnsafeAccessors<TKey>
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Data>k__BackingField")]
+        public static extern ref string Data(CompiledModelTestBase.DependentDerived<TKey> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs
new file mode 100644
index 00000000..2dfbab56
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs
@@ -0,0 +1,16409 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Reflection;
+using System.Text;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class ManyTypesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes",
+                typeof(CompiledModelTestBase.ManyTypes),
+                baseEntityType,
+                propertyCount: 241,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(CompiledModelTestBase.ManyTypesId),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                valueConverter: new CompiledModelTestBase.ManyTypesIdConverter());
+            id.SetGetter(
+                CompiledModelTestBase.ManyTypesId (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Id(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Id(instance).Equals(default(CompiledModelTestBase.ManyTypesId)));
+            id.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.ManyTypesId value) =>
+                {
+                    ManyTypesUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.ManyTypesId value) =>
+                {
+                    ManyTypesUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                CompiledModelTestBase.ManyTypesId (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<CompiledModelTestBase.ManyTypesId>(0) : (entry.FlaggedAsTemporary(0) && ManyTypesUnsafeAccessors.Id(((CompiledModelTestBase.ManyTypes)(entry.Entity))).Equals(default(CompiledModelTestBase.ManyTypesId)) ? entry.ReadTemporaryValue<CompiledModelTestBase.ManyTypesId>(0) : ManyTypesUnsafeAccessors.Id(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                CompiledModelTestBase.ManyTypesId (IInternalEntry entry) => ManyTypesUnsafeAccessors.Id(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.ManyTypesId (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.ManyTypesId>(id, 0),
+                CompiledModelTestBase.ManyTypesId (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<CompiledModelTestBase.ManyTypesId>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            id.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.ManyTypesId>(
+                    bool (CompiledModelTestBase.ManyTypesId v1, CompiledModelTestBase.ManyTypesId v2) => v1.Equals(v2),
+                    int (CompiledModelTestBase.ManyTypesId v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.ManyTypesId (CompiledModelTestBase.ManyTypesId v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.ManyTypesId>(
+                    bool (CompiledModelTestBase.ManyTypesId v1, CompiledModelTestBase.ManyTypesId v2) => v1.Equals(v2),
+                    int (CompiledModelTestBase.ManyTypesId v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.ManyTypesId (CompiledModelTestBase.ManyTypesId v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.ManyTypesId, int>(
+                    int (CompiledModelTestBase.ManyTypesId v) => v.Id,
+                    CompiledModelTestBase.ManyTypesId (int v) => new CompiledModelTestBase.ManyTypesId(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.ManyTypesId, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.ManyTypesId, int>(
+                        int (CompiledModelTestBase.ManyTypesId v) => v.Id,
+                        CompiledModelTestBase.ManyTypesId (int v) => new CompiledModelTestBase.ManyTypesId(v))));
+            id.SetCurrentValueComparer(new CurrentProviderValueComparer<CompiledModelTestBase.ManyTypesId, int>(id));
+            id.SetSentinelFromProviderValue(0);
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var @bool = runtimeEntityType.AddProperty(
+                "Bool",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Bool", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Bool>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: false);
+            @bool.SetGetter(
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Bool(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Bool(instance) == false);
+            @bool.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.Bool(instance) = value;
+                    return instance;
+                });
+            @bool.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.Bool(instance) = value;
+                    return instance;
+                });
+            @bool.SetAccessors(
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.Bool(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.Bool(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => entry.ReadOriginalValue<bool>(@bool, 1),
+                bool (IInternalEntry entry) => entry.GetCurrentValue<bool>(@bool));
+            @bool.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @bool.TypeMapping = JetBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v));
+
+            var boolArray = runtimeEntityType.AddProperty(
+                "BoolArray",
+                typeof(bool[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolArray.SetGetter(
+                bool[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolArray(instance) == null);
+            boolArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolArray(instance) = value;
+                    return instance;
+                });
+            boolArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolArray(instance) = value;
+                    return instance;
+                });
+            boolArray.SetAccessors(
+                bool[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool[] (IInternalEntry entry) => entry.ReadOriginalValue<bool[]>(boolArray, 2),
+                bool[] (IInternalEntry entry) => entry.GetCurrentValue<bool[]>(boolArray));
+            boolArray.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<bool[], bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v)),
+                keyComparer: new ListOfValueTypesComparer<bool[], bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<bool>(new JsonCollectionOfStructsReaderWriter<bool[], bool>(
+                    JsonBoolReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<bool[], bool>(
+                    JsonBoolReaderWriter.Instance),
+                elementMapping: JetBoolTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    keyComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    providerValueComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v)));
+            var boolArrayElementType = boolArray.SetElementType(typeof(bool));
+            boolArrayElementType.TypeMapping = boolArray.TypeMapping.ElementTypeMapping;
+
+            var boolReadOnlyCollection = runtimeEntityType.AddProperty(
+                "BoolReadOnlyCollection",
+                typeof(IReadOnlyCollection<bool>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_boolReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<bool> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<bool>)(ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance) == null);
+            boolReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<bool> value) =>
+                {
+                    ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance) = ((List<bool>)value);
+                    return instance;
+                });
+            boolReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<bool> value) =>
+                {
+                    ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance) = ((List<bool>)value);
+                    return instance;
+                });
+            boolReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<bool> (IInternalEntry entry) => ((IReadOnlyCollection<bool>)(ManyTypesUnsafeAccessors._boolReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<bool> (IInternalEntry entry) => ((IReadOnlyCollection<bool>)(ManyTypesUnsafeAccessors._boolReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<bool> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<bool>>(boolReadOnlyCollection, 3),
+                IReadOnlyCollection<bool> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<bool>>(boolReadOnlyCollection));
+            boolReadOnlyCollection.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<bool>, bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<bool>, bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<bool>(new JsonCollectionOfStructsReaderWriter<List<bool>, bool>(
+                    JsonBoolReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<bool>, bool>(
+                    JsonBoolReaderWriter.Instance),
+                elementMapping: JetBoolTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    keyComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    providerValueComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v)));
+            var boolReadOnlyCollectionElementType = boolReadOnlyCollection.SetElementType(typeof(bool));
+            boolReadOnlyCollectionElementType.TypeMapping = boolReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var boolToStringConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToStringConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolToStringConverterProperty.SetGetter(
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToStringConverterProperty(instance) == false);
+            boolToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToStringConverterProperty.SetAccessors(
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => entry.ReadOriginalValue<bool>(boolToStringConverterProperty, 4),
+                bool (IInternalEntry entry) => entry.GetCurrentValue<bool>(boolToStringConverterProperty));
+            boolToStringConverterProperty.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<bool, string>(
+                    string (bool v) => ((string)((v ? "B" : "A"))),
+                    bool (string v) => !(string.IsNullOrEmpty(v)) && ((int)(v.ToUpperInvariant()[0])) == ((int)("B".ToUpperInvariant()[0]))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<bool, string>(
+                        string (bool v) => ((string)((v ? "B" : "A"))),
+                        bool (string v) => !(string.IsNullOrEmpty(v)) && ((int)(v.ToUpperInvariant()[0])) == ((int)("B".ToUpperInvariant()[0])))));
+            boolToStringConverterProperty.SetSentinelFromProviderValue("A");
+
+            var boolToTwoValuesConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToTwoValuesConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToTwoValuesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToTwoValuesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolToTwoValuesConverterProperty.SetGetter(
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(instance) == false);
+            boolToTwoValuesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToTwoValuesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToTwoValuesConverterProperty.SetAccessors(
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => entry.ReadOriginalValue<bool>(boolToTwoValuesConverterProperty, 5),
+                bool (IInternalEntry entry) => entry.GetCurrentValue<bool>(boolToTwoValuesConverterProperty));
+            boolToTwoValuesConverterProperty.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolToTwoValuesConverterProperty.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                converter: new ValueConverter<bool, byte>(
+                    byte (bool v) => ((byte)((v ? 1 : 0))),
+                    bool (byte v) => v == 1),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<bool, byte>(
+                        byte (bool v) => ((byte)((v ? 1 : 0))),
+                        bool (byte v) => v == 1)));
+            boolToTwoValuesConverterProperty.SetSentinelFromProviderValue((byte)0);
+
+            var boolToZeroOneConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToZeroOneConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToZeroOneConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToZeroOneConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new BoolToZeroOneConverter<short>());
+            boolToZeroOneConverterProperty.SetGetter(
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(instance) == false);
+            boolToZeroOneConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToZeroOneConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToZeroOneConverterProperty.SetAccessors(
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => entry.ReadOriginalValue<bool>(boolToZeroOneConverterProperty, 6),
+                bool (IInternalEntry entry) => entry.GetCurrentValue<bool>(boolToZeroOneConverterProperty));
+            boolToZeroOneConverterProperty.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolToZeroOneConverterProperty.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<bool, short>(
+                    short (bool v) => ((short)((v ? 1 : 0))),
+                    bool (short v) => v == 1),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<bool, short>(
+                        short (bool v) => ((short)((v ? 1 : 0))),
+                        bool (short v) => v == 1)));
+            boolToZeroOneConverterProperty.SetSentinelFromProviderValue((short)0);
+
+            var bytes = runtimeEntityType.AddProperty(
+                "Bytes",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Bytes", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Bytes>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            bytes.SetGetter(
+                byte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Bytes(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Bytes(instance) == null);
+            bytes.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Bytes(instance) = value;
+                    return instance;
+                });
+            bytes.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Bytes(instance) = value;
+                    return instance;
+                });
+            bytes.SetAccessors(
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Bytes(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Bytes(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(bytes, 7),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(bytes));
+            bytes.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            bytes.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var bytesArray = runtimeEntityType.AddProperty(
+                "BytesArray",
+                typeof(byte[][]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BytesArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BytesArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            bytesArray.SetGetter(
+                byte[][] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BytesArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BytesArray(instance) == null);
+            bytesArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[][] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BytesArray(instance) = value;
+                    return instance;
+                });
+            bytesArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[][] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BytesArray(instance) = value;
+                    return instance;
+                });
+            bytesArray.SetAccessors(
+                byte[][] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BytesArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[][] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BytesArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[][] (IInternalEntry entry) => entry.ReadOriginalValue<byte[][]>(bytesArray, 8),
+                byte[][] (IInternalEntry entry) => entry.GetCurrentValue<byte[][]>(bytesArray));
+            bytesArray.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            bytesArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<byte[][], byte[]>(new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<byte[][], byte[]>(new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte[]>(new JsonCollectionOfReferencesReaderWriter<byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance),
+                elementMapping: JetByteArrayTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => ((object)v).GetHashCode(),
+                        byte[] (byte[] v) => v),
+                    keyComparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                        byte[] (byte[] source) => source.ToArray()),
+                    providerValueComparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                        byte[] (byte[] source) => source.ToArray()),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longbinary"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            var bytesArrayElementType = bytesArray.SetElementType(typeof(byte[]));
+            bytesArrayElementType.TypeMapping = bytesArray.TypeMapping.ElementTypeMapping;
+
+            var bytesToStringConverterProperty = runtimeEntityType.AddProperty(
+                "BytesToStringConverterProperty",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BytesToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BytesToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new BytesToStringConverter(),
+                valueComparer: new ArrayStructuralComparer<byte>());
+            bytesToStringConverterProperty.SetGetter(
+                byte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BytesToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BytesToStringConverterProperty(instance) == null);
+            bytesToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BytesToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            bytesToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BytesToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            bytesToStringConverterProperty.SetAccessors(
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BytesToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BytesToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(bytesToStringConverterProperty, 9),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(bytesToStringConverterProperty));
+            bytesToStringConverterProperty.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            bytesToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<byte[], string>(
+                    string (byte[] v) => Convert.ToBase64String(v),
+                    byte[] (string v) => Convert.FromBase64String(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<byte[], string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<byte[], string>(
+                        string (byte[] v) => Convert.ToBase64String(v),
+                        byte[] (string v) => Convert.FromBase64String(v))));
+
+            var castingConverterProperty = runtimeEntityType.AddProperty(
+                "CastingConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CastingConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CastingConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new CastingConverter<int, decimal>());
+            castingConverterProperty.SetGetter(
+                int (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CastingConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CastingConverterProperty(instance) == 0);
+            castingConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.CastingConverterProperty(instance) = value;
+                    return instance;
+                });
+            castingConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.CastingConverterProperty(instance) = value;
+                    return instance;
+                });
+            castingConverterProperty.SetAccessors(
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.CastingConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.CastingConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(castingConverterProperty, 10),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(castingConverterProperty));
+            castingConverterProperty.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            castingConverterProperty.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                converter: new ValueConverter<int, decimal>(
+                    decimal (int v) => ((decimal)v),
+                    int (decimal v) => ((int)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<int, decimal>(
+                        decimal (int v) => ((decimal)v),
+                        int (decimal v) => ((int)v))));
+            castingConverterProperty.SetSentinelFromProviderValue(0m);
+
+            var @char = runtimeEntityType.AddProperty(
+                "Char",
+                typeof(char),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Char", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Char>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            @char.SetGetter(
+                char (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Char(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Char(instance) == '\0');
+            @char.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char value) =>
+                {
+                    ManyTypesUnsafeAccessors.Char(instance) = value;
+                    return instance;
+                });
+            @char.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char value) =>
+                {
+                    ManyTypesUnsafeAccessors.Char(instance) = value;
+                    return instance;
+                });
+            @char.SetAccessors(
+                char (IInternalEntry entry) => ManyTypesUnsafeAccessors.Char(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char (IInternalEntry entry) => ManyTypesUnsafeAccessors.Char(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char (IInternalEntry entry) => entry.ReadOriginalValue<char>(@char, 11),
+                char (IInternalEntry entry) => entry.GetCurrentValue<char>(@char));
+            @char.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @char.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                keyComparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<char, string>(
+                    string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0]))));
+            @char.SetSentinelFromProviderValue("\0");
+
+            var charArray = runtimeEntityType.AddProperty(
+                "CharArray",
+                typeof(char[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CharArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CharArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            charArray.SetGetter(
+                char[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CharArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CharArray(instance) == null);
+            charArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.CharArray(instance) = value;
+                    return instance;
+                });
+            charArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.CharArray(instance) = value;
+                    return instance;
+                });
+            charArray.SetAccessors(
+                char[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.CharArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.CharArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char[] (IInternalEntry entry) => entry.ReadOriginalValue<char[]>(charArray, 12),
+                char[] (IInternalEntry entry) => entry.GetCurrentValue<char[]>(charArray));
+            charArray.SetPropertyIndexes(
+                index: 12,
+                originalValueIndex: 12,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            charArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<char[], char>(new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v)),
+                keyComparer: new ListOfValueTypesComparer<char[], char>(new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<char>(new JsonCollectionOfStructsReaderWriter<char[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0]))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<char[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0])))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<char>(
+                        bool (char v1, char v2) => v1 == v2,
+                        int (char v) => ((int)v),
+                        char (char v) => v),
+                    keyComparer: new ValueComparer<char>(
+                        bool (char v1, char v2) => v1 == v2,
+                        int (char v) => ((int)v),
+                        char (char v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(1)",
+                        size: 1),
+                    converter: new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0])))));
+            var charArrayElementType = charArray.SetElementType(typeof(char));
+            charArrayElementType.TypeMapping = charArray.TypeMapping.ElementTypeMapping;
+
+            var charToStringConverterProperty = runtimeEntityType.AddProperty(
+                "CharToStringConverterProperty",
+                typeof(char),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CharToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CharToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new CharToStringConverter());
+            charToStringConverterProperty.SetGetter(
+                char (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CharToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CharToStringConverterProperty(instance) == '\0');
+            charToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char value) =>
+                {
+                    ManyTypesUnsafeAccessors.CharToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            charToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char value) =>
+                {
+                    ManyTypesUnsafeAccessors.CharToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            charToStringConverterProperty.SetAccessors(
+                char (IInternalEntry entry) => ManyTypesUnsafeAccessors.CharToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char (IInternalEntry entry) => ManyTypesUnsafeAccessors.CharToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char (IInternalEntry entry) => entry.ReadOriginalValue<char>(charToStringConverterProperty, 13),
+                char (IInternalEntry entry) => entry.GetCurrentValue<char>(charToStringConverterProperty));
+            charToStringConverterProperty.SetPropertyIndexes(
+                index: 13,
+                originalValueIndex: 13,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            charToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                keyComparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "char(1)",
+                    size: 1,
+                    fixedLength: true),
+                converter: new ValueConverter<char, string>(
+                    string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0]))));
+            charToStringConverterProperty.SetSentinelFromProviderValue("\0");
+            charToStringConverterProperty.AddAnnotation("Relational:IsFixedLength", true);
+
+            var dateOnly = runtimeEntityType.AddProperty(
+                "DateOnly",
+                typeof(DateOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateOnly(1, 1, 1));
+            dateOnly.SetGetter(
+                DateOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnly(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnly(instance) == default(DateOnly));
+            dateOnly.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnly(instance) = value;
+                    return instance;
+                });
+            dateOnly.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnly(instance) = value;
+                    return instance;
+                });
+            dateOnly.SetAccessors(
+                DateOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly>(dateOnly, 14),
+                DateOnly (IInternalEntry entry) => entry.GetCurrentValue<DateOnly>(dateOnly));
+            dateOnly.SetPropertyIndexes(
+                index: 14,
+                originalValueIndex: 14,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateOnly.TypeMapping = JetDateOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                keyComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                providerValueComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v));
+
+            var dateOnlyArray = runtimeEntityType.AddProperty(
+                "DateOnlyArray",
+                typeof(DateOnly[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            dateOnlyArray.SetGetter(
+                DateOnly[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnlyArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnlyArray(instance) == null);
+            dateOnlyArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnlyArray(instance) = value;
+                    return instance;
+                });
+            dateOnlyArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnlyArray(instance) = value;
+                    return instance;
+                });
+            dateOnlyArray.SetAccessors(
+                DateOnly[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly[] (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly[]>(dateOnlyArray, 15),
+                DateOnly[] (IInternalEntry entry) => entry.GetCurrentValue<DateOnly[]>(dateOnlyArray));
+            dateOnlyArray.SetPropertyIndexes(
+                index: 15,
+                originalValueIndex: 15,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateOnlyArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateOnly[], DateOnly>(new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateOnly[], DateOnly>(new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateOnly>(new JsonCollectionOfStructsReaderWriter<DateOnly[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateOnly[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance),
+                elementMapping: JetDateOnlyTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v),
+                    keyComparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v),
+                    providerValueComparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v)));
+            var dateOnlyArrayElementType = dateOnlyArray.SetElementType(typeof(DateOnly));
+            dateOnlyArrayElementType.TypeMapping = dateOnlyArray.TypeMapping.ElementTypeMapping;
+
+            var dateOnlyToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateOnlyToStringConverterProperty",
+                typeof(DateOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnlyToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnlyToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateOnlyToStringConverter());
+            dateOnlyToStringConverterProperty.SetGetter(
+                DateOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(instance) == default(DateOnly));
+            dateOnlyToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateOnlyToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateOnlyToStringConverterProperty.SetAccessors(
+                DateOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly>(dateOnlyToStringConverterProperty, 16),
+                DateOnly (IInternalEntry entry) => entry.GetCurrentValue<DateOnly>(dateOnlyToStringConverterProperty));
+            dateOnlyToStringConverterProperty.SetPropertyIndexes(
+                index: 16,
+                originalValueIndex: 16,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateOnlyToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                keyComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(10)",
+                    size: 10),
+                converter: new ValueConverter<DateOnly, string>(
+                    string (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"),
+                    DateOnly (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateOnly, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<DateOnly, string>(
+                        string (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"),
+                        DateOnly (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None))));
+            dateOnlyToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01");
+
+            var dateTime = runtimeEntityType.AddProperty(
+                "DateTime",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+            dateTime.SetGetter(
+                DateTime (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTime(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTime(instance) == default(DateTime));
+            dateTime.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTime(instance) = value;
+                    return instance;
+                });
+            dateTime.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTime(instance) = value;
+                    return instance;
+                });
+            dateTime.SetAccessors(
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTime(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTime(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => entry.ReadOriginalValue<DateTime>(dateTime, 17),
+                DateTime (IInternalEntry entry) => entry.GetCurrentValue<DateTime>(dateTime));
+            dateTime.SetPropertyIndexes(
+                index: 17,
+                originalValueIndex: 17,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTime.TypeMapping = JetDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v));
+
+            var dateTimeArray = runtimeEntityType.AddProperty(
+                "DateTimeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            dateTimeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeArray(instance) == null);
+            dateTimeArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeArray(instance) = value;
+                    return instance;
+                });
+            dateTimeArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeArray(instance) = value;
+                    return instance;
+                });
+            dateTimeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(dateTimeArray, 18),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(dateTimeArray));
+            dateTimeArray.SetPropertyIndexes(
+                index: 18,
+                originalValueIndex: 18,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var dateTimeArrayElementType = dateTimeArray.SetElementType(typeof(DateTime));
+            dateTimeArrayElementType.TypeMapping = dateTimeArray.TypeMapping.ElementTypeMapping;
+
+            var dateTimeOffsetToBinaryConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToBinaryConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToBinaryConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToBinaryConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToBinaryConverter());
+            dateTimeOffsetToBinaryConverterProperty.SetGetter(
+                DateTimeOffset (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(instance).EqualsExact(default(DateTimeOffset)));
+            dateTimeOffsetToBinaryConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToBinaryConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToBinaryConverterProperty.SetAccessors(
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => entry.ReadOriginalValue<DateTimeOffset>(dateTimeOffsetToBinaryConverterProperty, 19),
+                DateTimeOffset (IInternalEntry entry) => entry.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToBinaryConverterProperty));
+            dateTimeOffsetToBinaryConverterProperty.SetPropertyIndexes(
+                index: 19,
+                originalValueIndex: 19,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeOffsetToBinaryConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                keyComparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<DateTimeOffset, long>(
+                    long (DateTimeOffset v) => DateTimeOffsetToBinaryConverter.ToLong(v),
+                    DateTimeOffset (long v) => DateTimeOffsetToBinaryConverter.ToDateTimeOffset(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTimeOffset, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<DateTimeOffset, long>(
+                        long (DateTimeOffset v) => DateTimeOffsetToBinaryConverter.ToLong(v),
+                        DateTimeOffset (long v) => DateTimeOffsetToBinaryConverter.ToDateTimeOffset(v))));
+            dateTimeOffsetToBinaryConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var dateTimeOffsetToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToBytesConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToBytesConverter());
+            dateTimeOffsetToBytesConverterProperty.SetGetter(
+                DateTimeOffset (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(instance).EqualsExact(default(DateTimeOffset)));
+            dateTimeOffsetToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToBytesConverterProperty.SetAccessors(
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => entry.ReadOriginalValue<DateTimeOffset>(dateTimeOffsetToBytesConverterProperty, 20),
+                DateTimeOffset (IInternalEntry entry) => entry.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToBytesConverterProperty));
+            dateTimeOffsetToBytesConverterProperty.SetPropertyIndexes(
+                index: 20,
+                originalValueIndex: 20,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeOffsetToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                keyComparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(12)",
+                    size: 12),
+                converter: new ValueConverter<DateTimeOffset, byte[]>(
+                    byte[] (DateTimeOffset v) => DateTimeOffsetToBytesConverter.ToBytes(v),
+                    DateTimeOffset (byte[] v) => DateTimeOffsetToBytesConverter.FromBytes(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTimeOffset, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<DateTimeOffset, byte[]>(
+                        byte[] (DateTimeOffset v) => DateTimeOffsetToBytesConverter.ToBytes(v),
+                        DateTimeOffset (byte[] v) => DateTimeOffsetToBytesConverter.FromBytes(v))));
+            dateTimeOffsetToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var dateTimeOffsetToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToStringConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToStringConverter());
+            dateTimeOffsetToStringConverterProperty.SetGetter(
+                DateTimeOffset (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(instance).EqualsExact(default(DateTimeOffset)));
+            dateTimeOffsetToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToStringConverterProperty.SetAccessors(
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => entry.ReadOriginalValue<DateTimeOffset>(dateTimeOffsetToStringConverterProperty, 21),
+                DateTimeOffset (IInternalEntry entry) => entry.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToStringConverterProperty));
+            dateTimeOffsetToStringConverterProperty.SetPropertyIndexes(
+                index: 21,
+                originalValueIndex: 21,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeOffsetToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                keyComparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<DateTimeOffset, string>(
+                    string (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"),
+                    DateTimeOffset (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTimeOffset, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<DateTimeOffset, string>(
+                        string (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"),
+                        DateTimeOffset (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture))));
+            dateTimeOffsetToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01 00:00:00+00:00");
+
+            var dateTimeToBinaryConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToBinaryConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToBinaryConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToBinaryConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeToBinaryConverter());
+            dateTimeToBinaryConverterProperty.SetGetter(
+                DateTime (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(instance) == default(DateTime));
+            dateTimeToBinaryConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToBinaryConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToBinaryConverterProperty.SetAccessors(
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => entry.ReadOriginalValue<DateTime>(dateTimeToBinaryConverterProperty, 22),
+                DateTime (IInternalEntry entry) => entry.GetCurrentValue<DateTime>(dateTimeToBinaryConverterProperty));
+            dateTimeToBinaryConverterProperty.SetPropertyIndexes(
+                index: 22,
+                originalValueIndex: 22,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeToBinaryConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<DateTime, long>(
+                    long (DateTime v) => v.ToBinary(),
+                    DateTime (long v) => DateTime.FromBinary(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTime, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<DateTime, long>(
+                        long (DateTime v) => v.ToBinary(),
+                        DateTime (long v) => DateTime.FromBinary(v))));
+            dateTimeToBinaryConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var dateTimeToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToStringConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeToStringConverter());
+            dateTimeToStringConverterProperty.SetGetter(
+                DateTime (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(instance) == default(DateTime));
+            dateTimeToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToStringConverterProperty.SetAccessors(
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => entry.ReadOriginalValue<DateTime>(dateTimeToStringConverterProperty, 23),
+                DateTime (IInternalEntry entry) => entry.GetCurrentValue<DateTime>(dateTimeToStringConverterProperty));
+            dateTimeToStringConverterProperty.SetPropertyIndexes(
+                index: 23,
+                originalValueIndex: 23,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<DateTime, string>(
+                    string (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"),
+                    DateTime (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTime, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<DateTime, string>(
+                        string (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"),
+                        DateTime (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture))));
+            dateTimeToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01 00:00:00");
+
+            var dateTimeToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToTicksConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+            dateTimeToTicksConverterProperty.SetGetter(
+                DateTime (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(instance) == default(DateTime));
+            dateTimeToTicksConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToTicksConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToTicksConverterProperty.SetAccessors(
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => entry.ReadOriginalValue<DateTime>(dateTimeToTicksConverterProperty, 24),
+                DateTime (IInternalEntry entry) => entry.GetCurrentValue<DateTime>(dateTimeToTicksConverterProperty));
+            dateTimeToTicksConverterProperty.SetPropertyIndexes(
+                index: 24,
+                originalValueIndex: 24,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeToTicksConverterProperty.TypeMapping = JetDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v));
+
+            var @decimal = runtimeEntityType.AddProperty(
+                "Decimal",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Decimal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Decimal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0m);
+            @decimal.SetGetter(
+                decimal (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Decimal(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Decimal(instance) == 0M);
+            @decimal.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.Decimal(instance) = value;
+                    return instance;
+                });
+            @decimal.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.Decimal(instance) = value;
+                    return instance;
+                });
+            @decimal.SetAccessors(
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.Decimal(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.Decimal(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => entry.ReadOriginalValue<decimal>(@decimal, 25),
+                decimal (IInternalEntry entry) => entry.GetCurrentValue<decimal>(@decimal));
+            @decimal.SetPropertyIndexes(
+                index: 25,
+                originalValueIndex: 25,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @decimal.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v));
+
+            var decimalArray = runtimeEntityType.AddProperty(
+                "DecimalArray",
+                typeof(decimal[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            decimalArray.SetGetter(
+                decimal[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalArray(instance) == null);
+            decimalArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalArray(instance) = value;
+                    return instance;
+                });
+            decimalArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalArray(instance) = value;
+                    return instance;
+                });
+            decimalArray.SetAccessors(
+                decimal[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal[] (IInternalEntry entry) => entry.ReadOriginalValue<decimal[]>(decimalArray, 26),
+                decimal[] (IInternalEntry entry) => entry.GetCurrentValue<decimal[]>(decimalArray));
+            decimalArray.SetPropertyIndexes(
+                index: 26,
+                originalValueIndex: 26,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            decimalArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<decimal[], decimal>(new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v)),
+                keyComparer: new ListOfValueTypesComparer<decimal[], decimal>(new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<decimal>(new JsonCollectionOfStructsReaderWriter<decimal[], decimal>(
+                    JsonDecimalReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<decimal[], decimal>(
+                    JsonDecimalReaderWriter.Instance),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    keyComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v)));
+            var decimalArrayElementType = decimalArray.SetElementType(typeof(decimal));
+            decimalArrayElementType.TypeMapping = decimalArray.TypeMapping.ElementTypeMapping;
+
+            var decimalNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DecimalNumberToBytesConverterProperty",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<decimal>());
+            decimalNumberToBytesConverterProperty.SetGetter(
+                decimal (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(instance) == 0M);
+            decimalNumberToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            decimalNumberToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            decimalNumberToBytesConverterProperty.SetAccessors(
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => entry.ReadOriginalValue<decimal>(decimalNumberToBytesConverterProperty, 27),
+                decimal (IInternalEntry entry) => entry.GetCurrentValue<decimal>(decimalNumberToBytesConverterProperty));
+            decimalNumberToBytesConverterProperty.SetPropertyIndexes(
+                index: 27,
+                originalValueIndex: 27,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            decimalNumberToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(16)",
+                    size: 16),
+                converter: new ValueConverter<decimal, byte[]>(
+                    byte[] (decimal v) => NumberToBytesConverter<decimal>.DecimalToBytes(v),
+                    decimal (byte[] v) => (v == null ? 0M : NumberToBytesConverter<decimal>.BytesToDecimal(v))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<decimal, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<decimal, byte[]>(
+                        byte[] (decimal v) => NumberToBytesConverter<decimal>.DecimalToBytes(v),
+                        decimal (byte[] v) => (v == null ? 0M : NumberToBytesConverter<decimal>.BytesToDecimal(v)))));
+            decimalNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var decimalNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DecimalNumberToStringConverterProperty",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<decimal>());
+            decimalNumberToStringConverterProperty.SetGetter(
+                decimal (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(instance) == 0M);
+            decimalNumberToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            decimalNumberToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            decimalNumberToStringConverterProperty.SetAccessors(
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => entry.ReadOriginalValue<decimal>(decimalNumberToStringConverterProperty, 28),
+                decimal (IInternalEntry entry) => entry.GetCurrentValue<decimal>(decimalNumberToStringConverterProperty));
+            decimalNumberToStringConverterProperty.SetPropertyIndexes(
+                index: 28,
+                originalValueIndex: 28,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            decimalNumberToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(64)",
+                    size: 64),
+                converter: new ValueConverter<decimal, string>(
+                    string (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    decimal (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<decimal, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<decimal, string>(
+                        string (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        decimal (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
+            decimalNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+
+            var @double = runtimeEntityType.AddProperty(
+                "Double",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Double", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Double>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0.0);
+            @double.SetGetter(
+                double (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Double(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Double(instance).Equals(0D));
+            @double.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.Double(instance) = value;
+                    return instance;
+                });
+            @double.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.Double(instance) = value;
+                    return instance;
+                });
+            @double.SetAccessors(
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.Double(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.Double(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => entry.ReadOriginalValue<double>(@double, 29),
+                double (IInternalEntry entry) => entry.GetCurrentValue<double>(@double));
+            @double.SetPropertyIndexes(
+                index: 29,
+                originalValueIndex: 29,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @double.TypeMapping = JetDoubleTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                providerValueComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v));
+
+            var doubleArray = runtimeEntityType.AddProperty(
+                "DoubleArray",
+                typeof(double[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            doubleArray.SetGetter(
+                double[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleArray(instance) == null);
+            doubleArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleArray(instance) = value;
+                    return instance;
+                });
+            doubleArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleArray(instance) = value;
+                    return instance;
+                });
+            doubleArray.SetAccessors(
+                double[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double[] (IInternalEntry entry) => entry.ReadOriginalValue<double[]>(doubleArray, 30),
+                double[] (IInternalEntry entry) => entry.GetCurrentValue<double[]>(doubleArray));
+            doubleArray.SetPropertyIndexes(
+                index: 30,
+                originalValueIndex: 30,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            doubleArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<double[], double>(new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v)),
+                keyComparer: new ListOfValueTypesComparer<double[], double>(new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<double>(new JsonCollectionOfStructsReaderWriter<double[], double>(
+                    JsonDoubleReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<double[], double>(
+                    JsonDoubleReaderWriter.Instance),
+                elementMapping: JetDoubleTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v),
+                    keyComparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v),
+                    providerValueComparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v)));
+            var doubleArrayElementType = doubleArray.SetElementType(typeof(double));
+            doubleArrayElementType.TypeMapping = doubleArray.TypeMapping.ElementTypeMapping;
+
+            var doubleNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DoubleNumberToBytesConverterProperty",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<double>());
+            doubleNumberToBytesConverterProperty.SetGetter(
+                double (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(instance).Equals(0D));
+            doubleNumberToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            doubleNumberToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            doubleNumberToBytesConverterProperty.SetAccessors(
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => entry.ReadOriginalValue<double>(doubleNumberToBytesConverterProperty, 31),
+                double (IInternalEntry entry) => entry.GetCurrentValue<double>(doubleNumberToBytesConverterProperty));
+            doubleNumberToBytesConverterProperty.SetPropertyIndexes(
+                index: 31,
+                originalValueIndex: 31,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            doubleNumberToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(8)",
+                    size: 8),
+                converter: new ValueConverter<double, byte[]>(
+                    byte[] (double v) => NumberToBytesConverter<double>.ReverseLong(BitConverter.GetBytes(v)),
+                    double (byte[] v) => (v == null ? 0D : BitConverter.ToDouble(NumberToBytesConverter<double>.ReverseLong(v), 0))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<double, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<double, byte[]>(
+                        byte[] (double v) => NumberToBytesConverter<double>.ReverseLong(BitConverter.GetBytes(v)),
+                        double (byte[] v) => (v == null ? 0D : BitConverter.ToDouble(NumberToBytesConverter<double>.ReverseLong(v), 0)))));
+            doubleNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var doubleNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DoubleNumberToStringConverterProperty",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<double>());
+            doubleNumberToStringConverterProperty.SetGetter(
+                double (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(instance).Equals(0D));
+            doubleNumberToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            doubleNumberToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            doubleNumberToStringConverterProperty.SetAccessors(
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => entry.ReadOriginalValue<double>(doubleNumberToStringConverterProperty, 32),
+                double (IInternalEntry entry) => entry.GetCurrentValue<double>(doubleNumberToStringConverterProperty));
+            doubleNumberToStringConverterProperty.SetPropertyIndexes(
+                index: 32,
+                originalValueIndex: 32,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            doubleNumberToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(64)",
+                    size: 64),
+                converter: new ValueConverter<double, string>(
+                    string (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", ((object)v)),
+                    double (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<double, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<double, string>(
+                        string (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", ((object)v)),
+                        double (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
+            doubleNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+
+            var enum16 = runtimeEntityType.AddProperty(
+                "Enum16",
+                typeof(CompiledModelTestBase.Enum16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16.SetGetter(
+                CompiledModelTestBase.Enum16 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum16(instance))), ((object)(CompiledModelTestBase.Enum16.Default))));
+            enum16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16(instance) = value;
+                    return instance;
+                });
+            enum16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16(instance) = value;
+                    return instance;
+                });
+            enum16.SetAccessors(
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16>(enum16, 33),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16>(enum16));
+            enum16.SetPropertyIndexes(
+                index: 33,
+                originalValueIndex: 33,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                    short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                    CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))));
+            enum16.SetSentinelFromProviderValue((short)0);
+
+            var enum16Array = runtimeEntityType.AddProperty(
+                "Enum16Array",
+                typeof(CompiledModelTestBase.Enum16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16Array.SetGetter(
+                CompiledModelTestBase.Enum16[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16Array(instance) == null);
+            enum16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16Array(instance) = value;
+                    return instance;
+                });
+            enum16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16Array(instance) = value;
+                    return instance;
+                });
+            enum16Array.SetAccessors(
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16[]>(enum16Array, 34),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16Array));
+            enum16Array.SetPropertyIndexes(
+                index: 34,
+                originalValueIndex: 34,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var enum16ArrayElementType = enum16Array.SetElementType(typeof(CompiledModelTestBase.Enum16));
+            enum16ArrayElementType.TypeMapping = enum16Array.TypeMapping.ElementTypeMapping;
+
+            var enum16AsString = runtimeEntityType.AddProperty(
+                "Enum16AsString",
+                typeof(CompiledModelTestBase.Enum16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum16AsString.SetGetter(
+                CompiledModelTestBase.Enum16 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum16AsString(instance))), ((object)(CompiledModelTestBase.Enum16.Default))));
+            enum16AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsString(instance) = value;
+                    return instance;
+                });
+            enum16AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsString(instance) = value;
+                    return instance;
+                });
+            enum16AsString.SetAccessors(
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16>(enum16AsString, 35),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16>(enum16AsString));
+            enum16AsString.SetPropertyIndexes(
+                index: 35,
+                originalValueIndex: 35,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                    string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                        string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v))));
+            enum16AsString.SetSentinelFromProviderValue("Default");
+
+            var enum16AsStringArray = runtimeEntityType.AddProperty(
+                "Enum16AsStringArray",
+                typeof(CompiledModelTestBase.Enum16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum16[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsStringArray(instance) == null);
+            enum16AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum16AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum16AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16[]>(enum16AsStringArray, 36),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16AsStringArray));
+            enum16AsStringArray.SetPropertyIndexes(
+                index: 36,
+                originalValueIndex: 36,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                        string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))));
+            var enum16AsStringArrayElementType = enum16AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum16),
+                providerClrType: typeof(string));
+            enum16AsStringArrayElementType.TypeMapping = enum16AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enum16AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum16AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum16> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsStringCollection(instance) == null);
+            enum16AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum16AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum16AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum16>>(enum16AsStringCollection, 37),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16AsStringCollection));
+            enum16AsStringCollection.SetPropertyIndexes(
+                index: 37,
+                originalValueIndex: 37,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                        string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))));
+            var enum16AsStringCollectionElementType = enum16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum16),
+                providerClrType: typeof(string));
+            enum16AsStringCollectionElementType.TypeMapping = enum16AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enum16Collection = runtimeEntityType.AddProperty(
+                "Enum16Collection",
+                typeof(List<CompiledModelTestBase.Enum16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16Collection.SetGetter(
+                List<CompiledModelTestBase.Enum16> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16Collection(instance) == null);
+            enum16Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16Collection(instance) = value;
+                    return instance;
+                });
+            enum16Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16Collection(instance) = value;
+                    return instance;
+                });
+            enum16Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum16>>(enum16Collection, 38),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16Collection));
+            enum16Collection.SetPropertyIndexes(
+                index: 38,
+                originalValueIndex: 38,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var enum16CollectionElementType = enum16Collection.SetElementType(typeof(CompiledModelTestBase.Enum16));
+            enum16CollectionElementType.TypeMapping = enum16Collection.TypeMapping.ElementTypeMapping;
+
+            var enum32 = runtimeEntityType.AddProperty(
+                "Enum32",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32.SetGetter(
+                CompiledModelTestBase.Enum32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum32(instance))), ((object)(CompiledModelTestBase.Enum32.Default))));
+            enum32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32(instance) = value;
+                    return instance;
+                });
+            enum32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32(instance) = value;
+                    return instance;
+                });
+            enum32.SetAccessors(
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32>(enum32, 39),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32>(enum32));
+            enum32.SetPropertyIndexes(
+                index: 39,
+                originalValueIndex: 39,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                    CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))));
+            enum32.SetSentinelFromProviderValue(0);
+
+            var enum32Array = runtimeEntityType.AddProperty(
+                "Enum32Array",
+                typeof(CompiledModelTestBase.Enum32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32Array.SetGetter(
+                CompiledModelTestBase.Enum32[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32Array(instance) == null);
+            enum32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32Array(instance) = value;
+                    return instance;
+                });
+            enum32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32Array(instance) = value;
+                    return instance;
+                });
+            enum32Array.SetAccessors(
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32[]>(enum32Array, 40),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32Array));
+            enum32Array.SetPropertyIndexes(
+                index: 40,
+                originalValueIndex: 40,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var enum32ArrayElementType = enum32Array.SetElementType(typeof(CompiledModelTestBase.Enum32));
+            enum32ArrayElementType.TypeMapping = enum32Array.TypeMapping.ElementTypeMapping;
+
+            var enum32AsString = runtimeEntityType.AddProperty(
+                "Enum32AsString",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum32AsString.SetGetter(
+                CompiledModelTestBase.Enum32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum32AsString(instance))), ((object)(CompiledModelTestBase.Enum32.Default))));
+            enum32AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsString(instance) = value;
+                    return instance;
+                });
+            enum32AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsString(instance) = value;
+                    return instance;
+                });
+            enum32AsString.SetAccessors(
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32>(enum32AsString, 41),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32>(enum32AsString));
+            enum32AsString.SetPropertyIndexes(
+                index: 41,
+                originalValueIndex: 41,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                    string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))));
+            enum32AsString.SetSentinelFromProviderValue("Default");
+
+            var enum32AsStringArray = runtimeEntityType.AddProperty(
+                "Enum32AsStringArray",
+                typeof(CompiledModelTestBase.Enum32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum32[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsStringArray(instance) == null);
+            enum32AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum32AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum32AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32[]>(enum32AsStringArray, 42),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32AsStringArray));
+            enum32AsStringArray.SetPropertyIndexes(
+                index: 42,
+                originalValueIndex: 42,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))));
+            var enum32AsStringArrayElementType = enum32AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum32),
+                providerClrType: typeof(string));
+            enum32AsStringArrayElementType.TypeMapping = enum32AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enum32AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum32AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum32> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsStringCollection(instance) == null);
+            enum32AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum32AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum32AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum32>>(enum32AsStringCollection, 43),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32AsStringCollection));
+            enum32AsStringCollection.SetPropertyIndexes(
+                index: 43,
+                originalValueIndex: 43,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))));
+            var enum32AsStringCollectionElementType = enum32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum32),
+                providerClrType: typeof(string));
+            enum32AsStringCollectionElementType.TypeMapping = enum32AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enum32Collection = runtimeEntityType.AddProperty(
+                "Enum32Collection",
+                typeof(List<CompiledModelTestBase.Enum32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32Collection.SetGetter(
+                List<CompiledModelTestBase.Enum32> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32Collection(instance) == null);
+            enum32Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32Collection(instance) = value;
+                    return instance;
+                });
+            enum32Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32Collection(instance) = value;
+                    return instance;
+                });
+            enum32Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum32>>(enum32Collection, 44),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32Collection));
+            enum32Collection.SetPropertyIndexes(
+                index: 44,
+                originalValueIndex: 44,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var enum32CollectionElementType = enum32Collection.SetElementType(typeof(CompiledModelTestBase.Enum32));
+            enum32CollectionElementType.TypeMapping = enum32Collection.TypeMapping.ElementTypeMapping;
+
+            var enum64 = runtimeEntityType.AddProperty(
+                "Enum64",
+                typeof(CompiledModelTestBase.Enum64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64.SetGetter(
+                CompiledModelTestBase.Enum64 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum64(instance))), ((object)(CompiledModelTestBase.Enum64.Default))));
+            enum64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64(instance) = value;
+                    return instance;
+                });
+            enum64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64(instance) = value;
+                    return instance;
+                });
+            enum64.SetAccessors(
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64>(enum64, 45),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64>(enum64));
+            enum64.SetPropertyIndexes(
+                index: 45,
+                originalValueIndex: 45,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                    long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                    CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))));
+            enum64.SetSentinelFromProviderValue(0L);
+
+            var enum64Array = runtimeEntityType.AddProperty(
+                "Enum64Array",
+                typeof(CompiledModelTestBase.Enum64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64Array.SetGetter(
+                CompiledModelTestBase.Enum64[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64Array(instance) == null);
+            enum64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64Array(instance) = value;
+                    return instance;
+                });
+            enum64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64Array(instance) = value;
+                    return instance;
+                });
+            enum64Array.SetAccessors(
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64[]>(enum64Array, 46),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64Array));
+            enum64Array.SetPropertyIndexes(
+                index: 46,
+                originalValueIndex: 46,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var enum64ArrayElementType = enum64Array.SetElementType(typeof(CompiledModelTestBase.Enum64));
+            enum64ArrayElementType.TypeMapping = enum64Array.TypeMapping.ElementTypeMapping;
+
+            var enum64AsString = runtimeEntityType.AddProperty(
+                "Enum64AsString",
+                typeof(CompiledModelTestBase.Enum64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum64AsString.SetGetter(
+                CompiledModelTestBase.Enum64 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum64AsString(instance))), ((object)(CompiledModelTestBase.Enum64.Default))));
+            enum64AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsString(instance) = value;
+                    return instance;
+                });
+            enum64AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsString(instance) = value;
+                    return instance;
+                });
+            enum64AsString.SetAccessors(
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64>(enum64AsString, 47),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64>(enum64AsString));
+            enum64AsString.SetPropertyIndexes(
+                index: 47,
+                originalValueIndex: 47,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                    string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                        string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v))));
+            enum64AsString.SetSentinelFromProviderValue("Default");
+
+            var enum64AsStringArray = runtimeEntityType.AddProperty(
+                "Enum64AsStringArray",
+                typeof(CompiledModelTestBase.Enum64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum64[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsStringArray(instance) == null);
+            enum64AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum64AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum64AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64[]>(enum64AsStringArray, 48),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64AsStringArray));
+            enum64AsStringArray.SetPropertyIndexes(
+                index: 48,
+                originalValueIndex: 48,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                        string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))));
+            var enum64AsStringArrayElementType = enum64AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum64),
+                providerClrType: typeof(string));
+            enum64AsStringArrayElementType.TypeMapping = enum64AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enum64AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum64AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum64> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsStringCollection(instance) == null);
+            enum64AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum64AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum64AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum64>>(enum64AsStringCollection, 49),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64AsStringCollection));
+            enum64AsStringCollection.SetPropertyIndexes(
+                index: 49,
+                originalValueIndex: 49,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                        string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))));
+            var enum64AsStringCollectionElementType = enum64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum64),
+                providerClrType: typeof(string));
+            enum64AsStringCollectionElementType.TypeMapping = enum64AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enum64Collection = runtimeEntityType.AddProperty(
+                "Enum64Collection",
+                typeof(List<CompiledModelTestBase.Enum64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64Collection.SetGetter(
+                List<CompiledModelTestBase.Enum64> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64Collection(instance) == null);
+            enum64Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64Collection(instance) = value;
+                    return instance;
+                });
+            enum64Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64Collection(instance) = value;
+                    return instance;
+                });
+            enum64Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum64>>(enum64Collection, 50),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64Collection));
+            enum64Collection.SetPropertyIndexes(
+                index: 50,
+                originalValueIndex: 50,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var enum64CollectionElementType = enum64Collection.SetElementType(typeof(CompiledModelTestBase.Enum64));
+            enum64CollectionElementType.TypeMapping = enum64Collection.TypeMapping.ElementTypeMapping;
+
+            var enum8 = runtimeEntityType.AddProperty(
+                "Enum8",
+                typeof(CompiledModelTestBase.Enum8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8.SetGetter(
+                CompiledModelTestBase.Enum8 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum8(instance))), ((object)(CompiledModelTestBase.Enum8.Default))));
+            enum8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8(instance) = value;
+                    return instance;
+                });
+            enum8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8(instance) = value;
+                    return instance;
+                });
+            enum8.SetAccessors(
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8>(enum8, 51),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8>(enum8));
+            enum8.SetPropertyIndexes(
+                index: 51,
+                originalValueIndex: 51,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                    short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                    CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))));
+            enum8.SetSentinelFromProviderValue((short)0);
+
+            var enum8Array = runtimeEntityType.AddProperty(
+                "Enum8Array",
+                typeof(CompiledModelTestBase.Enum8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8Array.SetGetter(
+                CompiledModelTestBase.Enum8[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8Array(instance) == null);
+            enum8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8Array(instance) = value;
+                    return instance;
+                });
+            enum8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8Array(instance) = value;
+                    return instance;
+                });
+            enum8Array.SetAccessors(
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8[]>(enum8Array, 52),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8Array));
+            enum8Array.SetPropertyIndexes(
+                index: 52,
+                originalValueIndex: 52,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var enum8ArrayElementType = enum8Array.SetElementType(typeof(CompiledModelTestBase.Enum8));
+            enum8ArrayElementType.TypeMapping = enum8Array.TypeMapping.ElementTypeMapping;
+
+            var enum8AsString = runtimeEntityType.AddProperty(
+                "Enum8AsString",
+                typeof(CompiledModelTestBase.Enum8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum8AsString.SetGetter(
+                CompiledModelTestBase.Enum8 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum8AsString(instance))), ((object)(CompiledModelTestBase.Enum8.Default))));
+            enum8AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsString(instance) = value;
+                    return instance;
+                });
+            enum8AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsString(instance) = value;
+                    return instance;
+                });
+            enum8AsString.SetAccessors(
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8>(enum8AsString, 53),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8>(enum8AsString));
+            enum8AsString.SetPropertyIndexes(
+                index: 53,
+                originalValueIndex: 53,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                    string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                        string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v))));
+            enum8AsString.SetSentinelFromProviderValue("Default");
+
+            var enum8AsStringArray = runtimeEntityType.AddProperty(
+                "Enum8AsStringArray",
+                typeof(CompiledModelTestBase.Enum8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum8[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsStringArray(instance) == null);
+            enum8AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum8AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum8AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8[]>(enum8AsStringArray, 54),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8AsStringArray));
+            enum8AsStringArray.SetPropertyIndexes(
+                index: 54,
+                originalValueIndex: 54,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                        string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))));
+            var enum8AsStringArrayElementType = enum8AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum8),
+                providerClrType: typeof(string));
+            enum8AsStringArrayElementType.TypeMapping = enum8AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enum8AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum8AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum8> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsStringCollection(instance) == null);
+            enum8AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum8AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum8AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum8>>(enum8AsStringCollection, 55),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8AsStringCollection));
+            enum8AsStringCollection.SetPropertyIndexes(
+                index: 55,
+                originalValueIndex: 55,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                        string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))));
+            var enum8AsStringCollectionElementType = enum8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum8),
+                providerClrType: typeof(string));
+            enum8AsStringCollectionElementType.TypeMapping = enum8AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enum8Collection = runtimeEntityType.AddProperty(
+                "Enum8Collection",
+                typeof(List<CompiledModelTestBase.Enum8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8Collection.SetGetter(
+                List<CompiledModelTestBase.Enum8> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8Collection(instance) == null);
+            enum8Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8Collection(instance) = value;
+                    return instance;
+                });
+            enum8Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8Collection(instance) = value;
+                    return instance;
+                });
+            enum8Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum8>>(enum8Collection, 56),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8Collection));
+            enum8Collection.SetPropertyIndexes(
+                index: 56,
+                originalValueIndex: 56,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var enum8CollectionElementType = enum8Collection.SetElementType(typeof(CompiledModelTestBase.Enum8));
+            enum8CollectionElementType.TypeMapping = enum8Collection.TypeMapping.ElementTypeMapping;
+
+            var enumToNumberConverterProperty = runtimeEntityType.AddProperty(
+                "EnumToNumberConverterProperty",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumToNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumToNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new EnumToNumberConverter<CompiledModelTestBase.Enum32, int>());
+            enumToNumberConverterProperty.SetGetter(
+                CompiledModelTestBase.Enum32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(instance))), ((object)(CompiledModelTestBase.Enum32.Default))));
+            enumToNumberConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            enumToNumberConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            enumToNumberConverterProperty.SetAccessors(
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32>(enumToNumberConverterProperty, 57),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32>(enumToNumberConverterProperty));
+            enumToNumberConverterProperty.SetPropertyIndexes(
+                index: 57,
+                originalValueIndex: 57,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumToNumberConverterProperty.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                    CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))));
+            enumToNumberConverterProperty.SetSentinelFromProviderValue(0);
+
+            var enumToStringConverterProperty = runtimeEntityType.AddProperty(
+                "EnumToStringConverterProperty",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new EnumToStringConverter<CompiledModelTestBase.Enum32>());
+            enumToStringConverterProperty.SetGetter(
+                CompiledModelTestBase.Enum32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumToStringConverterProperty(instance))), ((object)(CompiledModelTestBase.Enum32.Default))));
+            enumToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            enumToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            enumToStringConverterProperty.SetAccessors(
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32>(enumToStringConverterProperty, 58),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32>(enumToStringConverterProperty));
+            enumToStringConverterProperty.SetPropertyIndexes(
+                index: 58,
+                originalValueIndex: 58,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                    string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))));
+            enumToStringConverterProperty.SetSentinelFromProviderValue("Default");
+
+            var enumU16 = runtimeEntityType.AddProperty(
+                "EnumU16",
+                typeof(CompiledModelTestBase.EnumU16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16.SetGetter(
+                CompiledModelTestBase.EnumU16 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU16(instance))), ((object)(CompiledModelTestBase.EnumU16.Min))));
+            enumU16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16(instance) = value;
+                    return instance;
+                });
+            enumU16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16(instance) = value;
+                    return instance;
+                });
+            enumU16.SetAccessors(
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16>(enumU16, 59),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16>(enumU16));
+            enumU16.SetPropertyIndexes(
+                index: 59,
+                originalValueIndex: 59,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                    int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                    CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))));
+            enumU16.SetSentinelFromProviderValue(0);
+
+            var enumU16Array = runtimeEntityType.AddProperty(
+                "EnumU16Array",
+                typeof(CompiledModelTestBase.EnumU16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16Array.SetGetter(
+                CompiledModelTestBase.EnumU16[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16Array(instance) == null);
+            enumU16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16Array(instance) = value;
+                    return instance;
+                });
+            enumU16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16Array(instance) = value;
+                    return instance;
+                });
+            enumU16Array.SetAccessors(
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16[]>(enumU16Array, 60),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16Array));
+            enumU16Array.SetPropertyIndexes(
+                index: 60,
+                originalValueIndex: 60,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var enumU16ArrayElementType = enumU16Array.SetElementType(typeof(CompiledModelTestBase.EnumU16));
+            enumU16ArrayElementType.TypeMapping = enumU16Array.TypeMapping.ElementTypeMapping;
+
+            var enumU16AsString = runtimeEntityType.AddProperty(
+                "EnumU16AsString",
+                typeof(CompiledModelTestBase.EnumU16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU16AsString.SetGetter(
+                CompiledModelTestBase.EnumU16 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU16AsString(instance))), ((object)(CompiledModelTestBase.EnumU16.Min))));
+            enumU16AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsString(instance) = value;
+                    return instance;
+                });
+            enumU16AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsString(instance) = value;
+                    return instance;
+                });
+            enumU16AsString.SetAccessors(
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16>(enumU16AsString, 61),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16>(enumU16AsString));
+            enumU16AsString.SetPropertyIndexes(
+                index: 61,
+                originalValueIndex: 61,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                    string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                        string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v))));
+            enumU16AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU16AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU16AsStringArray",
+                typeof(CompiledModelTestBase.EnumU16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU16[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsStringArray(instance) == null);
+            enumU16AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU16AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU16AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16[]>(enumU16AsStringArray, 62),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16AsStringArray));
+            enumU16AsStringArray.SetPropertyIndexes(
+                index: 62,
+                originalValueIndex: 62,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                        string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))));
+            var enumU16AsStringArrayElementType = enumU16AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU16),
+                providerClrType: typeof(string));
+            enumU16AsStringArrayElementType.TypeMapping = enumU16AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enumU16AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU16AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU16> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsStringCollection(instance) == null);
+            enumU16AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU16AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU16AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU16>>(enumU16AsStringCollection, 63),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16AsStringCollection));
+            enumU16AsStringCollection.SetPropertyIndexes(
+                index: 63,
+                originalValueIndex: 63,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                        string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))));
+            var enumU16AsStringCollectionElementType = enumU16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU16),
+                providerClrType: typeof(string));
+            enumU16AsStringCollectionElementType.TypeMapping = enumU16AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enumU16Collection = runtimeEntityType.AddProperty(
+                "EnumU16Collection",
+                typeof(List<CompiledModelTestBase.EnumU16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU16> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16Collection(instance) == null);
+            enumU16Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16Collection(instance) = value;
+                    return instance;
+                });
+            enumU16Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16Collection(instance) = value;
+                    return instance;
+                });
+            enumU16Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU16>>(enumU16Collection, 64),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16Collection));
+            enumU16Collection.SetPropertyIndexes(
+                index: 64,
+                originalValueIndex: 64,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var enumU16CollectionElementType = enumU16Collection.SetElementType(typeof(CompiledModelTestBase.EnumU16));
+            enumU16CollectionElementType.TypeMapping = enumU16Collection.TypeMapping.ElementTypeMapping;
+
+            var enumU32 = runtimeEntityType.AddProperty(
+                "EnumU32",
+                typeof(CompiledModelTestBase.EnumU32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32.SetGetter(
+                CompiledModelTestBase.EnumU32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU32(instance))), ((object)(CompiledModelTestBase.EnumU32.Min))));
+            enumU32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32(instance) = value;
+                    return instance;
+                });
+            enumU32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32(instance) = value;
+                    return instance;
+                });
+            enumU32.SetAccessors(
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32>(enumU32, 65),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32>(enumU32));
+            enumU32.SetPropertyIndexes(
+                index: 65,
+                originalValueIndex: 65,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                    long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                    CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))));
+            enumU32.SetSentinelFromProviderValue(0L);
+
+            var enumU32Array = runtimeEntityType.AddProperty(
+                "EnumU32Array",
+                typeof(CompiledModelTestBase.EnumU32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32Array.SetGetter(
+                CompiledModelTestBase.EnumU32[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32Array(instance) == null);
+            enumU32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32Array(instance) = value;
+                    return instance;
+                });
+            enumU32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32Array(instance) = value;
+                    return instance;
+                });
+            enumU32Array.SetAccessors(
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32[]>(enumU32Array, 66),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32Array));
+            enumU32Array.SetPropertyIndexes(
+                index: 66,
+                originalValueIndex: 66,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var enumU32ArrayElementType = enumU32Array.SetElementType(typeof(CompiledModelTestBase.EnumU32));
+            enumU32ArrayElementType.TypeMapping = enumU32Array.TypeMapping.ElementTypeMapping;
+
+            var enumU32AsString = runtimeEntityType.AddProperty(
+                "EnumU32AsString",
+                typeof(CompiledModelTestBase.EnumU32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU32AsString.SetGetter(
+                CompiledModelTestBase.EnumU32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU32AsString(instance))), ((object)(CompiledModelTestBase.EnumU32.Min))));
+            enumU32AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsString(instance) = value;
+                    return instance;
+                });
+            enumU32AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsString(instance) = value;
+                    return instance;
+                });
+            enumU32AsString.SetAccessors(
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32>(enumU32AsString, 67),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32>(enumU32AsString));
+            enumU32AsString.SetPropertyIndexes(
+                index: 67,
+                originalValueIndex: 67,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                    string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                        string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))));
+            enumU32AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU32AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU32AsStringArray",
+                typeof(CompiledModelTestBase.EnumU32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU32[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsStringArray(instance) == null);
+            enumU32AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU32AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU32AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32[]>(enumU32AsStringArray, 68),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32AsStringArray));
+            enumU32AsStringArray.SetPropertyIndexes(
+                index: 68,
+                originalValueIndex: 68,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                        string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))));
+            var enumU32AsStringArrayElementType = enumU32AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU32),
+                providerClrType: typeof(string));
+            enumU32AsStringArrayElementType.TypeMapping = enumU32AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enumU32AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU32AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU32> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsStringCollection(instance) == null);
+            enumU32AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU32AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU32AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU32>>(enumU32AsStringCollection, 69),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32AsStringCollection));
+            enumU32AsStringCollection.SetPropertyIndexes(
+                index: 69,
+                originalValueIndex: 69,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                        string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))));
+            var enumU32AsStringCollectionElementType = enumU32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU32),
+                providerClrType: typeof(string));
+            enumU32AsStringCollectionElementType.TypeMapping = enumU32AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enumU32Collection = runtimeEntityType.AddProperty(
+                "EnumU32Collection",
+                typeof(List<CompiledModelTestBase.EnumU32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU32> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32Collection(instance) == null);
+            enumU32Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32Collection(instance) = value;
+                    return instance;
+                });
+            enumU32Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32Collection(instance) = value;
+                    return instance;
+                });
+            enumU32Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU32>>(enumU32Collection, 70),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32Collection));
+            enumU32Collection.SetPropertyIndexes(
+                index: 70,
+                originalValueIndex: 70,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var enumU32CollectionElementType = enumU32Collection.SetElementType(typeof(CompiledModelTestBase.EnumU32));
+            enumU32CollectionElementType.TypeMapping = enumU32Collection.TypeMapping.ElementTypeMapping;
+
+            var enumU64 = runtimeEntityType.AddProperty(
+                "EnumU64",
+                typeof(CompiledModelTestBase.EnumU64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64.SetGetter(
+                CompiledModelTestBase.EnumU64 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU64(instance))), ((object)(CompiledModelTestBase.EnumU64.Min))));
+            enumU64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64(instance) = value;
+                    return instance;
+                });
+            enumU64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64(instance) = value;
+                    return instance;
+                });
+            enumU64.SetAccessors(
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64>(enumU64, 71),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64>(enumU64));
+            enumU64.SetPropertyIndexes(
+                index: 71,
+                originalValueIndex: 71,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                    decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                    CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))));
+            enumU64.SetSentinelFromProviderValue(0m);
+
+            var enumU64Array = runtimeEntityType.AddProperty(
+                "EnumU64Array",
+                typeof(CompiledModelTestBase.EnumU64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64Array.SetGetter(
+                CompiledModelTestBase.EnumU64[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64Array(instance) == null);
+            enumU64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64Array(instance) = value;
+                    return instance;
+                });
+            enumU64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64Array(instance) = value;
+                    return instance;
+                });
+            enumU64Array.SetAccessors(
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64[]>(enumU64Array, 72),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64Array));
+            enumU64Array.SetPropertyIndexes(
+                index: 72,
+                originalValueIndex: 72,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var enumU64ArrayElementType = enumU64Array.SetElementType(typeof(CompiledModelTestBase.EnumU64));
+            enumU64ArrayElementType.TypeMapping = enumU64Array.TypeMapping.ElementTypeMapping;
+
+            var enumU64AsString = runtimeEntityType.AddProperty(
+                "EnumU64AsString",
+                typeof(CompiledModelTestBase.EnumU64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU64AsString.SetGetter(
+                CompiledModelTestBase.EnumU64 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU64AsString(instance))), ((object)(CompiledModelTestBase.EnumU64.Min))));
+            enumU64AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsString(instance) = value;
+                    return instance;
+                });
+            enumU64AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsString(instance) = value;
+                    return instance;
+                });
+            enumU64AsString.SetAccessors(
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64>(enumU64AsString, 73),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64>(enumU64AsString));
+            enumU64AsString.SetPropertyIndexes(
+                index: 73,
+                originalValueIndex: 73,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                    string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                        string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v))));
+            enumU64AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU64AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU64AsStringArray",
+                typeof(CompiledModelTestBase.EnumU64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU64[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsStringArray(instance) == null);
+            enumU64AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU64AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU64AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64[]>(enumU64AsStringArray, 74),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64AsStringArray));
+            enumU64AsStringArray.SetPropertyIndexes(
+                index: 74,
+                originalValueIndex: 74,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                        string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))));
+            var enumU64AsStringArrayElementType = enumU64AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU64),
+                providerClrType: typeof(string));
+            enumU64AsStringArrayElementType.TypeMapping = enumU64AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enumU64AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU64AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU64> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsStringCollection(instance) == null);
+            enumU64AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU64AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU64AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU64>>(enumU64AsStringCollection, 75),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64AsStringCollection));
+            enumU64AsStringCollection.SetPropertyIndexes(
+                index: 75,
+                originalValueIndex: 75,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                        string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))));
+            var enumU64AsStringCollectionElementType = enumU64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU64),
+                providerClrType: typeof(string));
+            enumU64AsStringCollectionElementType.TypeMapping = enumU64AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enumU64Collection = runtimeEntityType.AddProperty(
+                "EnumU64Collection",
+                typeof(List<CompiledModelTestBase.EnumU64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU64> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64Collection(instance) == null);
+            enumU64Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64Collection(instance) = value;
+                    return instance;
+                });
+            enumU64Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64Collection(instance) = value;
+                    return instance;
+                });
+            enumU64Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU64>>(enumU64Collection, 76),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64Collection));
+            enumU64Collection.SetPropertyIndexes(
+                index: 76,
+                originalValueIndex: 76,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var enumU64CollectionElementType = enumU64Collection.SetElementType(typeof(CompiledModelTestBase.EnumU64));
+            enumU64CollectionElementType.TypeMapping = enumU64Collection.TypeMapping.ElementTypeMapping;
+
+            var enumU8 = runtimeEntityType.AddProperty(
+                "EnumU8",
+                typeof(CompiledModelTestBase.EnumU8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8.SetGetter(
+                CompiledModelTestBase.EnumU8 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU8(instance))), ((object)(CompiledModelTestBase.EnumU8.Min))));
+            enumU8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8(instance) = value;
+                    return instance;
+                });
+            enumU8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8(instance) = value;
+                    return instance;
+                });
+            enumU8.SetAccessors(
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8>(enumU8, 77),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8>(enumU8));
+            enumU8.SetPropertyIndexes(
+                index: 77,
+                originalValueIndex: 77,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                    byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                    CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))));
+            enumU8.SetSentinelFromProviderValue((byte)0);
+
+            var enumU8Array = runtimeEntityType.AddProperty(
+                "EnumU8Array",
+                typeof(CompiledModelTestBase.EnumU8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8Array.SetGetter(
+                CompiledModelTestBase.EnumU8[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8Array(instance) == null);
+            enumU8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8Array(instance) = value;
+                    return instance;
+                });
+            enumU8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8Array(instance) = value;
+                    return instance;
+                });
+            enumU8Array.SetAccessors(
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8[]>(enumU8Array, 78),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8Array));
+            enumU8Array.SetPropertyIndexes(
+                index: 78,
+                originalValueIndex: 78,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var enumU8ArrayElementType = enumU8Array.SetElementType(typeof(CompiledModelTestBase.EnumU8));
+            enumU8ArrayElementType.TypeMapping = enumU8Array.TypeMapping.ElementTypeMapping;
+
+            var enumU8AsString = runtimeEntityType.AddProperty(
+                "EnumU8AsString",
+                typeof(CompiledModelTestBase.EnumU8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU8AsString.SetGetter(
+                CompiledModelTestBase.EnumU8 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU8AsString(instance))), ((object)(CompiledModelTestBase.EnumU8.Min))));
+            enumU8AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsString(instance) = value;
+                    return instance;
+                });
+            enumU8AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsString(instance) = value;
+                    return instance;
+                });
+            enumU8AsString.SetAccessors(
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8>(enumU8AsString, 79),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8>(enumU8AsString));
+            enumU8AsString.SetPropertyIndexes(
+                index: 79,
+                originalValueIndex: 79,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                    string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                        string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v))));
+            enumU8AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU8AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU8AsStringArray",
+                typeof(CompiledModelTestBase.EnumU8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU8[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsStringArray(instance) == null);
+            enumU8AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU8AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU8AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8[]>(enumU8AsStringArray, 80),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8AsStringArray));
+            enumU8AsStringArray.SetPropertyIndexes(
+                index: 80,
+                originalValueIndex: 80,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                        string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))));
+            var enumU8AsStringArrayElementType = enumU8AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU8),
+                providerClrType: typeof(string));
+            enumU8AsStringArrayElementType.TypeMapping = enumU8AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enumU8AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU8AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU8> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsStringCollection(instance) == null);
+            enumU8AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU8AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU8AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU8>>(enumU8AsStringCollection, 81),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8AsStringCollection));
+            enumU8AsStringCollection.SetPropertyIndexes(
+                index: 81,
+                originalValueIndex: 81,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                        string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))));
+            var enumU8AsStringCollectionElementType = enumU8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU8),
+                providerClrType: typeof(string));
+            enumU8AsStringCollectionElementType.TypeMapping = enumU8AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enumU8Collection = runtimeEntityType.AddProperty(
+                "EnumU8Collection",
+                typeof(List<CompiledModelTestBase.EnumU8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU8> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8Collection(instance) == null);
+            enumU8Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8Collection(instance) = value;
+                    return instance;
+                });
+            enumU8Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8Collection(instance) = value;
+                    return instance;
+                });
+            enumU8Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU8>>(enumU8Collection, 82),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8Collection));
+            enumU8Collection.SetPropertyIndexes(
+                index: 82,
+                originalValueIndex: 82,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var enumU8CollectionElementType = enumU8Collection.SetElementType(typeof(CompiledModelTestBase.EnumU8));
+            enumU8CollectionElementType.TypeMapping = enumU8Collection.TypeMapping.ElementTypeMapping;
+
+            var @float = runtimeEntityType.AddProperty(
+                "Float",
+                typeof(float),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Float", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Float>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0f);
+            @float.SetGetter(
+                float (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Float(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Float(instance).Equals(0F));
+            @float.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float value) =>
+                {
+                    ManyTypesUnsafeAccessors.Float(instance) = value;
+                    return instance;
+                });
+            @float.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float value) =>
+                {
+                    ManyTypesUnsafeAccessors.Float(instance) = value;
+                    return instance;
+                });
+            @float.SetAccessors(
+                float (IInternalEntry entry) => ManyTypesUnsafeAccessors.Float(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float (IInternalEntry entry) => ManyTypesUnsafeAccessors.Float(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float (IInternalEntry entry) => entry.ReadOriginalValue<float>(@float, 83),
+                float (IInternalEntry entry) => entry.GetCurrentValue<float>(@float));
+            @float.SetPropertyIndexes(
+                index: 83,
+                originalValueIndex: 83,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @float.TypeMapping = JetFloatTypeMapping.Default.Clone(
+                comparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v),
+                keyComparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v),
+                providerValueComparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v));
+
+            var floatArray = runtimeEntityType.AddProperty(
+                "FloatArray",
+                typeof(float[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("FloatArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<FloatArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            floatArray.SetGetter(
+                float[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.FloatArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.FloatArray(instance) == null);
+            floatArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.FloatArray(instance) = value;
+                    return instance;
+                });
+            floatArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.FloatArray(instance) = value;
+                    return instance;
+                });
+            floatArray.SetAccessors(
+                float[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.FloatArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.FloatArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float[] (IInternalEntry entry) => entry.ReadOriginalValue<float[]>(floatArray, 84),
+                float[] (IInternalEntry entry) => entry.GetCurrentValue<float[]>(floatArray));
+            floatArray.SetPropertyIndexes(
+                index: 84,
+                originalValueIndex: 84,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            floatArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<float[], float>(new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v)),
+                keyComparer: new ListOfValueTypesComparer<float[], float>(new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<float>(new JsonCollectionOfStructsReaderWriter<float[], float>(
+                    JsonFloatReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<float[], float>(
+                    JsonFloatReaderWriter.Instance),
+                elementMapping: JetFloatTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v),
+                    keyComparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v),
+                    providerValueComparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v)));
+            var floatArrayElementType = floatArray.SetElementType(typeof(float));
+            floatArrayElementType.TypeMapping = floatArray.TypeMapping.ElementTypeMapping;
+
+            var guid = runtimeEntityType.AddProperty(
+                "Guid",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Guid", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Guid>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            guid.SetGetter(
+                Guid (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Guid(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Guid(instance) == new Guid("00000000-0000-0000-0000-000000000000"));
+            guid.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.Guid(instance) = value;
+                    return instance;
+                });
+            guid.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.Guid(instance) = value;
+                    return instance;
+                });
+            guid.SetAccessors(
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.Guid(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.Guid(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(guid, 85),
+                Guid (IInternalEntry entry) => entry.GetCurrentValue<Guid>(guid));
+            guid.SetPropertyIndexes(
+                index: 85,
+                originalValueIndex: 85,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            guid.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+
+            var guidArray = runtimeEntityType.AddProperty(
+                "GuidArray",
+                typeof(Guid[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            guidArray.SetGetter(
+                Guid[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidArray(instance) == null);
+            guidArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidArray(instance) = value;
+                    return instance;
+                });
+            guidArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidArray(instance) = value;
+                    return instance;
+                });
+            guidArray.SetAccessors(
+                Guid[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid[] (IInternalEntry entry) => entry.ReadOriginalValue<Guid[]>(guidArray, 86),
+                Guid[] (IInternalEntry entry) => entry.GetCurrentValue<Guid[]>(guidArray));
+            guidArray.SetPropertyIndexes(
+                index: 86,
+                originalValueIndex: 86,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            guidArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<Guid[], Guid>(new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v)),
+                keyComparer: new ListOfValueTypesComparer<Guid[], Guid>(new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<Guid>(new JsonCollectionOfStructsReaderWriter<Guid[], Guid>(
+                    JsonGuidReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<Guid[], Guid>(
+                    JsonGuidReaderWriter.Instance),
+                elementMapping: JetGuidTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v),
+                    keyComparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v),
+                    providerValueComparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v)));
+            var guidArrayElementType = guidArray.SetElementType(typeof(Guid));
+            guidArrayElementType.TypeMapping = guidArray.TypeMapping.ElementTypeMapping;
+
+            var guidToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "GuidToBytesConverterProperty",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new GuidToBytesConverter());
+            guidToBytesConverterProperty.SetGetter(
+                Guid (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(instance) == new Guid("00000000-0000-0000-0000-000000000000"));
+            guidToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            guidToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            guidToBytesConverterProperty.SetAccessors(
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(guidToBytesConverterProperty, 87),
+                Guid (IInternalEntry entry) => entry.GetCurrentValue<Guid>(guidToBytesConverterProperty));
+            guidToBytesConverterProperty.SetPropertyIndexes(
+                index: 87,
+                originalValueIndex: 87,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            guidToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(16)",
+                    size: 16),
+                converter: new ValueConverter<Guid, byte[]>(
+                    byte[] (Guid v) => v.ToByteArray(),
+                    Guid (byte[] v) => new Guid(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Guid, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<Guid, byte[]>(
+                        byte[] (Guid v) => v.ToByteArray(),
+                        Guid (byte[] v) => new Guid(v))));
+            guidToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var guidToStringConverterProperty = runtimeEntityType.AddProperty(
+                "GuidToStringConverterProperty",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new GuidToStringConverter());
+            guidToStringConverterProperty.SetGetter(
+                Guid (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidToStringConverterProperty(instance) == new Guid("00000000-0000-0000-0000-000000000000"));
+            guidToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            guidToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            guidToStringConverterProperty.SetAccessors(
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(guidToStringConverterProperty, 88),
+                Guid (IInternalEntry entry) => entry.GetCurrentValue<Guid>(guidToStringConverterProperty));
+            guidToStringConverterProperty.SetPropertyIndexes(
+                index: 88,
+                originalValueIndex: 88,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            guidToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(36)",
+                    size: 36),
+                converter: new ValueConverter<Guid, string>(
+                    string (Guid v) => v.ToString("D"),
+                    Guid (string v) => new Guid(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Guid, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Guid, string>(
+                        string (Guid v) => v.ToString("D"),
+                        Guid (string v) => new Guid(v))));
+            guidToStringConverterProperty.SetSentinelFromProviderValue("00000000-0000-0000-0000-000000000000");
+
+            var iPAddress = runtimeEntityType.AddProperty(
+                "IPAddress",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            iPAddress.SetGetter(
+                IPAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddress(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddress(instance) == null);
+            iPAddress.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddress(instance) = value;
+                    return instance;
+                });
+            iPAddress.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddress(instance) = value;
+                    return instance;
+                });
+            iPAddress.SetAccessors(
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress>(iPAddress, 89),
+                IPAddress (IInternalEntry entry) => entry.GetCurrentValue<IPAddress>(iPAddress));
+            iPAddress.SetPropertyIndexes(
+                index: 89,
+                originalValueIndex: 89,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddress.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(45)",
+                    size: 45),
+                converter: new ValueConverter<IPAddress, string>(
+                    string (IPAddress v) => ((object)v).ToString(),
+                    IPAddress (string v) => IPAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v))));
+
+            var iPAddressArray = runtimeEntityType.AddProperty(
+                "IPAddressArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            iPAddressArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressArray(instance) == null);
+            iPAddressArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressArray(instance) = value;
+                    return instance;
+                });
+            iPAddressArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressArray(instance) = value;
+                    return instance;
+                });
+            iPAddressArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(iPAddressArray, 90),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(iPAddressArray));
+            iPAddressArray.SetPropertyIndexes(
+                index: 90,
+                originalValueIndex: 90,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddressArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var iPAddressArrayElementType = iPAddressArray.SetElementType(typeof(IPAddress));
+            iPAddressArrayElementType.TypeMapping = iPAddressArray.TypeMapping.ElementTypeMapping;
+
+            var iPAddressReadOnlyCollection = runtimeEntityType.AddProperty(
+                "IPAddressReadOnlyCollection",
+                typeof(IReadOnlyCollection<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_ipAddressReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            iPAddressReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<IPAddress> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<IPAddress>)(ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance) == null);
+            iPAddressReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<IPAddress> value) =>
+                {
+                    ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance) = ((List<IPAddress>)value);
+                    return instance;
+                });
+            iPAddressReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<IPAddress> value) =>
+                {
+                    ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance) = ((List<IPAddress>)value);
+                    return instance;
+                });
+            iPAddressReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<IPAddress> (IInternalEntry entry) => ((IReadOnlyCollection<IPAddress>)(ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<IPAddress> (IInternalEntry entry) => ((IReadOnlyCollection<IPAddress>)(ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<IPAddress>>(iPAddressReadOnlyCollection, 91),
+                IReadOnlyCollection<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<IPAddress>>(iPAddressReadOnlyCollection));
+            iPAddressReadOnlyCollection.SetPropertyIndexes(
+                index: 91,
+                originalValueIndex: 91,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddressReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var iPAddressReadOnlyCollectionElementType = iPAddressReadOnlyCollection.SetElementType(typeof(IPAddress),
+                providerClrType: typeof(string));
+            iPAddressReadOnlyCollectionElementType.TypeMapping = iPAddressReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var iPAddressToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "IPAddressToBytesConverterProperty",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new IPAddressToBytesConverter());
+            iPAddressToBytesConverterProperty.SetGetter(
+                IPAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(instance) == null);
+            iPAddressToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            iPAddressToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            iPAddressToBytesConverterProperty.SetAccessors(
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress>(iPAddressToBytesConverterProperty, 92),
+                IPAddress (IInternalEntry entry) => entry.GetCurrentValue<IPAddress>(iPAddressToBytesConverterProperty));
+            iPAddressToBytesConverterProperty.SetPropertyIndexes(
+                index: 92,
+                originalValueIndex: 92,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddressToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(16)",
+                    size: 16),
+                converter: new ValueConverter<IPAddress, byte[]>(
+                    byte[] (IPAddress v) => v.GetAddressBytes(),
+                    IPAddress (byte[] v) => new IPAddress(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<IPAddress, byte[]>(
+                        byte[] (IPAddress v) => v.GetAddressBytes(),
+                        IPAddress (byte[] v) => new IPAddress(v))));
+
+            var iPAddressToStringConverterProperty = runtimeEntityType.AddProperty(
+                "IPAddressToStringConverterProperty",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new IPAddressToStringConverter());
+            iPAddressToStringConverterProperty.SetGetter(
+                IPAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(instance) == null);
+            iPAddressToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            iPAddressToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            iPAddressToStringConverterProperty.SetAccessors(
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress>(iPAddressToStringConverterProperty, 93),
+                IPAddress (IInternalEntry entry) => entry.GetCurrentValue<IPAddress>(iPAddressToStringConverterProperty));
+            iPAddressToStringConverterProperty.SetPropertyIndexes(
+                index: 93,
+                originalValueIndex: 93,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddressToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(45)",
+                    size: 45),
+                converter: new ValueConverter<IPAddress, string>(
+                    string (IPAddress v) => ((object)v).ToString(),
+                    IPAddress (string v) => IPAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v))));
+
+            var int16 = runtimeEntityType.AddProperty(
+                "Int16",
+                typeof(short),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (short)0);
+            int16.SetGetter(
+                short (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int16(instance) == 0);
+            int16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int16(instance) = value;
+                    return instance;
+                });
+            int16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int16(instance) = value;
+                    return instance;
+                });
+            int16.SetAccessors(
+                short (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short (IInternalEntry entry) => entry.ReadOriginalValue<short>(int16, 94),
+                short (IInternalEntry entry) => entry.GetCurrentValue<short>(int16));
+            int16.SetPropertyIndexes(
+                index: 94,
+                originalValueIndex: 94,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int16.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                keyComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v));
+
+            var int16Array = runtimeEntityType.AddProperty(
+                "Int16Array",
+                typeof(short[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int16Array.SetGetter(
+                short[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int16Array(instance) == null);
+            int16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int16Array(instance) = value;
+                    return instance;
+                });
+            int16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int16Array(instance) = value;
+                    return instance;
+                });
+            int16Array.SetAccessors(
+                short[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short[] (IInternalEntry entry) => entry.ReadOriginalValue<short[]>(int16Array, 95),
+                short[] (IInternalEntry entry) => entry.GetCurrentValue<short[]>(int16Array));
+            int16Array.SetPropertyIndexes(
+                index: 95,
+                originalValueIndex: 95,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<short[], short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<short[], short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<short[], short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<short[], short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var int16ArrayElementType = int16Array.SetElementType(typeof(short));
+            int16ArrayElementType.TypeMapping = int16Array.TypeMapping.ElementTypeMapping;
+
+            var int32 = runtimeEntityType.AddProperty(
+                "Int32",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0);
+            int32.SetGetter(
+                int (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int32(instance) == 0);
+            int32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int32(instance) = value;
+                    return instance;
+                });
+            int32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int32(instance) = value;
+                    return instance;
+                });
+            int32.SetAccessors(
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(int32, 96),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(int32));
+            int32.SetPropertyIndexes(
+                index: 96,
+                originalValueIndex: 96,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int32.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+
+            var int32Array = runtimeEntityType.AddProperty(
+                "Int32Array",
+                typeof(int[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int32Array.SetGetter(
+                int[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int32Array(instance) == null);
+            int32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int32Array(instance) = value;
+                    return instance;
+                });
+            int32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int32Array(instance) = value;
+                    return instance;
+                });
+            int32Array.SetAccessors(
+                int[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int[] (IInternalEntry entry) => entry.ReadOriginalValue<int[]>(int32Array, 97),
+                int[] (IInternalEntry entry) => entry.GetCurrentValue<int[]>(int32Array));
+            int32Array.SetPropertyIndexes(
+                index: 97,
+                originalValueIndex: 97,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<int[], int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v)),
+                keyComparer: new ListOfValueTypesComparer<int[], int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<int>(new JsonCollectionOfStructsReaderWriter<int[], int>(
+                    JsonInt32ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<int[], int>(
+                    JsonInt32ReaderWriter.Instance),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v)));
+            var int32ArrayElementType = int32Array.SetElementType(typeof(int));
+            int32ArrayElementType.TypeMapping = int32Array.TypeMapping.ElementTypeMapping;
+
+            var int32ReadOnlyCollection = runtimeEntityType.AddProperty(
+                "Int32ReadOnlyCollection",
+                typeof(IReadOnlyCollection<int>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32ReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_int32ReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int32ReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<int> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<int>)(ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance) == null);
+            int32ReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<int> value) =>
+                {
+                    ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance) = ((List<int>)value);
+                    return instance;
+                });
+            int32ReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<int> value) =>
+                {
+                    ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance) = ((List<int>)value);
+                    return instance;
+                });
+            int32ReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<int> (IInternalEntry entry) => ((IReadOnlyCollection<int>)(ManyTypesUnsafeAccessors._int32ReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<int> (IInternalEntry entry) => ((IReadOnlyCollection<int>)(ManyTypesUnsafeAccessors._int32ReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<int> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<int>>(int32ReadOnlyCollection, 98),
+                IReadOnlyCollection<int> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<int>>(int32ReadOnlyCollection));
+            int32ReadOnlyCollection.SetPropertyIndexes(
+                index: 98,
+                originalValueIndex: 98,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int32ReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<int>, int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<int>, int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<int>(new JsonCollectionOfStructsReaderWriter<List<int>, int>(
+                    JsonInt32ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<int>, int>(
+                    JsonInt32ReaderWriter.Instance),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v)));
+            var int32ReadOnlyCollectionElementType = int32ReadOnlyCollection.SetElementType(typeof(int));
+            int32ReadOnlyCollectionElementType.TypeMapping = int32ReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var int64 = runtimeEntityType.AddProperty(
+                "Int64",
+                typeof(long),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0L);
+            int64.SetGetter(
+                long (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int64(instance) == 0L);
+            int64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int64(instance) = value;
+                    return instance;
+                });
+            int64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int64(instance) = value;
+                    return instance;
+                });
+            int64.SetAccessors(
+                long (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(int64, 99),
+                long (IInternalEntry entry) => entry.GetCurrentValue<long>(int64));
+            int64.SetPropertyIndexes(
+                index: 99,
+                originalValueIndex: 99,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int64.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+
+            var int64Array = runtimeEntityType.AddProperty(
+                "Int64Array",
+                typeof(long[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int64Array.SetGetter(
+                long[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int64Array(instance) == null);
+            int64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int64Array(instance) = value;
+                    return instance;
+                });
+            int64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int64Array(instance) = value;
+                    return instance;
+                });
+            int64Array.SetAccessors(
+                long[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long[] (IInternalEntry entry) => entry.ReadOriginalValue<long[]>(int64Array, 100),
+                long[] (IInternalEntry entry) => entry.GetCurrentValue<long[]>(int64Array));
+            int64Array.SetPropertyIndexes(
+                index: 100,
+                originalValueIndex: 100,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<long[], long>(new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v)),
+                keyComparer: new ListOfValueTypesComparer<long[], long>(new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<long>(new JsonCollectionOfStructsReaderWriter<long[], long>(
+                    JsonInt64ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<long[], long>(
+                    JsonInt64ReaderWriter.Instance),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    keyComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v)));
+            var int64ArrayElementType = int64Array.SetElementType(typeof(long));
+            int64ArrayElementType.TypeMapping = int64Array.TypeMapping.ElementTypeMapping;
+
+            var int8 = runtimeEntityType.AddProperty(
+                "Int8",
+                typeof(sbyte),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int8.SetGetter(
+                sbyte (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int8(instance) == 0);
+            int8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int8(instance) = value;
+                    return instance;
+                });
+            int8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int8(instance) = value;
+                    return instance;
+                });
+            int8.SetAccessors(
+                sbyte (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte (IInternalEntry entry) => entry.ReadOriginalValue<sbyte>(int8, 101),
+                sbyte (IInternalEntry entry) => entry.GetCurrentValue<sbyte>(int8));
+            int8.SetPropertyIndexes(
+                index: 101,
+                originalValueIndex: 101,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int8.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v),
+                keyComparer: new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<sbyte, short>(
+                    short (sbyte v) => ((short)v),
+                    sbyte (short v) => ((sbyte)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<sbyte, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<sbyte, short>(
+                        short (sbyte v) => ((short)v),
+                        sbyte (short v) => ((sbyte)v))));
+            int8.SetSentinelFromProviderValue((short)0);
+
+            var int8Array = runtimeEntityType.AddProperty(
+                "Int8Array",
+                typeof(sbyte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int8Array.SetGetter(
+                sbyte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int8Array(instance) == null);
+            int8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int8Array(instance) = value;
+                    return instance;
+                });
+            int8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int8Array(instance) = value;
+                    return instance;
+                });
+            int8Array.SetAccessors(
+                sbyte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte[] (IInternalEntry entry) => entry.ReadOriginalValue<sbyte[]>(int8Array, 102),
+                sbyte[] (IInternalEntry entry) => entry.GetCurrentValue<sbyte[]>(int8Array));
+            int8Array.SetPropertyIndexes(
+                index: 102,
+                originalValueIndex: 102,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<sbyte[], sbyte>(new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<sbyte[], sbyte>(new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<sbyte>(new JsonCollectionOfStructsReaderWriter<sbyte[], sbyte>(
+                    new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<sbyte[], sbyte>(
+                    new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<sbyte>(
+                        bool (sbyte v1, sbyte v2) => v1 == v2,
+                        int (sbyte v) => ((int)v),
+                        sbyte (sbyte v) => v),
+                    keyComparer: new ValueComparer<sbyte>(
+                        bool (sbyte v1, sbyte v2) => v1 == v2,
+                        int (sbyte v) => ((int)v),
+                        sbyte (sbyte v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<sbyte, short>(
+                        short (sbyte v) => ((short)v),
+                        sbyte (short v) => ((sbyte)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v)))));
+            var int8ArrayElementType = int8Array.SetElementType(typeof(sbyte));
+            int8ArrayElementType.TypeMapping = int8Array.TypeMapping.ElementTypeMapping;
+
+            var intNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "IntNumberToBytesConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IntNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IntNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<int>());
+            intNumberToBytesConverterProperty.SetGetter(
+                int (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(instance) == 0);
+            intNumberToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            intNumberToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            intNumberToBytesConverterProperty.SetAccessors(
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(intNumberToBytesConverterProperty, 103),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(intNumberToBytesConverterProperty));
+            intNumberToBytesConverterProperty.SetPropertyIndexes(
+                index: 103,
+                originalValueIndex: 103,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            intNumberToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(4)",
+                    size: 4),
+                converter: new ValueConverter<int, byte[]>(
+                    byte[] (int v) => NumberToBytesConverter<int>.ReverseInt(BitConverter.GetBytes(v)),
+                    int (byte[] v) => (v == null ? 0 : BitConverter.ToInt32(NumberToBytesConverter<int>.ReverseInt((v.Length == 0 ? new byte[4] : v)), 0))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<int, byte[]>(
+                        byte[] (int v) => NumberToBytesConverter<int>.ReverseInt(BitConverter.GetBytes(v)),
+                        int (byte[] v) => (v == null ? 0 : BitConverter.ToInt32(NumberToBytesConverter<int>.ReverseInt((v.Length == 0 ? new byte[4] : v)), 0)))));
+            intNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0 });
+
+            var intNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "IntNumberToStringConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IntNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IntNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<int>());
+            intNumberToStringConverterProperty.SetGetter(
+                int (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(instance) == 0);
+            intNumberToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            intNumberToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            intNumberToStringConverterProperty.SetAccessors(
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(intNumberToStringConverterProperty, 104),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(intNumberToStringConverterProperty));
+            intNumberToStringConverterProperty.SetPropertyIndexes(
+                index: 104,
+                originalValueIndex: 104,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            intNumberToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(64)",
+                    size: 64),
+                converter: new ValueConverter<int, string>(
+                    string (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    int (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<int, string>(
+                        string (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        int (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
+            intNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+
+            var nullIntToNullStringConverterProperty = runtimeEntityType.AddProperty(
+                "NullIntToNullStringConverterProperty",
+                typeof(int?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullIntToNullStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullIntToNullStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                valueConverter: new CompiledModelTestBase.NullIntToNullStringConverter());
+            nullIntToNullStringConverterProperty.SetGetter(
+                int? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(instance).HasValue));
+            nullIntToNullStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            nullIntToNullStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            nullIntToNullStringConverterProperty.SetAccessors(
+                int? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? (IInternalEntry entry) => entry.ReadOriginalValue<int?>(nullIntToNullStringConverterProperty, 105),
+                int? (IInternalEntry entry) => entry.GetCurrentValue<int?>(nullIntToNullStringConverterProperty));
+            nullIntToNullStringConverterProperty.SetPropertyIndexes(
+                index: 105,
+                originalValueIndex: 105,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullIntToNullStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int?>(
+                    bool (int? v1, int? v2) => v1 == v2,
+                    int (int? v) => ((int)v),
+                    int? (int? v) => v),
+                keyComparer: new ValueComparer<int?>(
+                    bool (int? v1, int? v2) => v1 == v2,
+                    int (int? v) => ((int)v),
+                    int? (int? v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<int?, string>(
+                    string (int? v) => (v == null ? null : ((object)v).ToString()),
+                    int? (string v) => (v == null || v == "<null>" ? null : ((int? )(int.Parse(v)))),
+                    convertsNulls: true),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int?, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<int?, string>(
+                        string (int? v) => (v == null ? null : ((object)v).ToString()),
+                        int? (string v) => (v == null || v == "<null>" ? null : ((int? )(int.Parse(v)))),
+                        convertsNulls: true)));
+
+            var nullableBool = runtimeEntityType.AddProperty(
+                "NullableBool",
+                typeof(bool?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBool", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBool>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableBool.SetGetter(
+                bool? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBool(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableBool(instance).HasValue));
+            nullableBool.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBool(instance) = value;
+                    return instance;
+                });
+            nullableBool.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBool(instance) = value;
+                    return instance;
+                });
+            nullableBool.SetAccessors(
+                bool? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBool(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBool(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool? (IInternalEntry entry) => entry.ReadOriginalValue<bool?>(nullableBool, 106),
+                bool? (IInternalEntry entry) => entry.GetCurrentValue<bool?>(nullableBool));
+            nullableBool.SetPropertyIndexes(
+                index: 106,
+                originalValueIndex: 106,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableBool.TypeMapping = JetBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v));
+            nullableBool.SetComparer(new NullableValueComparer<bool>(nullableBool.TypeMapping.Comparer));
+            nullableBool.SetKeyComparer(new NullableValueComparer<bool>(nullableBool.TypeMapping.KeyComparer));
+
+            var nullableBoolArray = runtimeEntityType.AddProperty(
+                "NullableBoolArray",
+                typeof(bool?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBoolArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBoolArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableBoolArray.SetGetter(
+                bool? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBoolArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBoolArray(instance) == null);
+            nullableBoolArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBoolArray(instance) = value;
+                    return instance;
+                });
+            nullableBoolArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBoolArray(instance) = value;
+                    return instance;
+                });
+            nullableBoolArray.SetAccessors(
+                bool? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBoolArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBoolArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool? [] (IInternalEntry entry) => entry.ReadOriginalValue<bool? []>(nullableBoolArray, 107),
+                bool? [] (IInternalEntry entry) => entry.GetCurrentValue<bool? []>(nullableBoolArray));
+            nullableBoolArray.SetPropertyIndexes(
+                index: 107,
+                originalValueIndex: 107,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableBoolArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<bool?[], bool>(new NullableValueComparer<bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<bool?[], bool>(new NullableValueComparer<bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<bool?>(new JsonCollectionOfNullableStructsReaderWriter<bool?[], bool>(
+                    JsonBoolReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<bool?[], bool>(
+                    JsonBoolReaderWriter.Instance),
+                elementMapping: JetBoolTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    keyComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    providerValueComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v)));
+            var nullableBoolArrayElementType = nullableBoolArray.SetElementType(typeof(bool?),
+                nullable: true);
+            nullableBoolArrayElementType.TypeMapping = nullableBoolArray.TypeMapping.ElementTypeMapping;
+            nullableBoolArrayElementType.SetComparer(new NullableValueComparer<bool>(nullableBoolArrayElementType.TypeMapping.Comparer));
+
+            var nullableBytes = runtimeEntityType.AddProperty(
+                "NullableBytes",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBytes", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBytes>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableBytes.SetGetter(
+                byte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBytes(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBytes(instance) == null);
+            nullableBytes.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBytes(instance) = value;
+                    return instance;
+                });
+            nullableBytes.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBytes(instance) = value;
+                    return instance;
+                });
+            nullableBytes.SetAccessors(
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBytes(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBytes(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(nullableBytes, 108),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(nullableBytes));
+            nullableBytes.SetPropertyIndexes(
+                index: 108,
+                originalValueIndex: 108,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableBytes.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var nullableBytesArray = runtimeEntityType.AddProperty(
+                "NullableBytesArray",
+                typeof(byte[][]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBytesArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBytesArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableBytesArray.SetGetter(
+                byte[][] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBytesArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBytesArray(instance) == null);
+            nullableBytesArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[][] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBytesArray(instance) = value;
+                    return instance;
+                });
+            nullableBytesArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[][] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBytesArray(instance) = value;
+                    return instance;
+                });
+            nullableBytesArray.SetAccessors(
+                byte[][] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBytesArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[][] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBytesArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[][] (IInternalEntry entry) => entry.ReadOriginalValue<byte[][]>(nullableBytesArray, 109),
+                byte[][] (IInternalEntry entry) => entry.GetCurrentValue<byte[][]>(nullableBytesArray));
+            nullableBytesArray.SetPropertyIndexes(
+                index: 109,
+                originalValueIndex: 109,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableBytesArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<byte[][], byte[]>(new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<byte[][], byte[]>(new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte[]>(new JsonCollectionOfReferencesReaderWriter<byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance),
+                elementMapping: JetByteArrayTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => ((object)v).GetHashCode(),
+                        byte[] (byte[] v) => v),
+                    keyComparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                        byte[] (byte[] source) => source.ToArray()),
+                    providerValueComparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                        byte[] (byte[] source) => source.ToArray()),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longbinary"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            var nullableBytesArrayElementType = nullableBytesArray.SetElementType(typeof(byte[]),
+                nullable: true);
+            nullableBytesArrayElementType.TypeMapping = nullableBytesArray.TypeMapping.ElementTypeMapping;
+
+            var nullableChar = runtimeEntityType.AddProperty(
+                "NullableChar",
+                typeof(char?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableChar", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableChar>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableChar.SetGetter(
+                char? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableChar(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableChar(instance).HasValue));
+            nullableChar.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableChar(instance) = value;
+                    return instance;
+                });
+            nullableChar.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableChar(instance) = value;
+                    return instance;
+                });
+            nullableChar.SetAccessors(
+                char? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableChar(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableChar(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char? (IInternalEntry entry) => entry.ReadOriginalValue<char?>(nullableChar, 110),
+                char? (IInternalEntry entry) => entry.GetCurrentValue<char?>(nullableChar));
+            nullableChar.SetPropertyIndexes(
+                index: 110,
+                originalValueIndex: 110,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableChar.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                keyComparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<char, string>(
+                    string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0]))));
+            nullableChar.SetComparer(new NullableValueComparer<char>(nullableChar.TypeMapping.Comparer));
+            nullableChar.SetKeyComparer(new NullableValueComparer<char>(nullableChar.TypeMapping.KeyComparer));
+
+            var nullableCharArray = runtimeEntityType.AddProperty(
+                "NullableCharArray",
+                typeof(char?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableCharArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableCharArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableCharArray.SetGetter(
+                char? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableCharArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableCharArray(instance) == null);
+            nullableCharArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableCharArray(instance) = value;
+                    return instance;
+                });
+            nullableCharArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableCharArray(instance) = value;
+                    return instance;
+                });
+            nullableCharArray.SetAccessors(
+                char? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableCharArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableCharArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char? [] (IInternalEntry entry) => entry.ReadOriginalValue<char? []>(nullableCharArray, 111),
+                char? [] (IInternalEntry entry) => entry.GetCurrentValue<char? []>(nullableCharArray));
+            nullableCharArray.SetPropertyIndexes(
+                index: 111,
+                originalValueIndex: 111,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableCharArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<char?[], char>(new NullableValueComparer<char>(new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<char?[], char>(new NullableValueComparer<char>(new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<char?>(new JsonCollectionOfNullableStructsReaderWriter<char?[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0]))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<char?[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0])))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<char>(
+                        bool (char v1, char v2) => v1 == v2,
+                        int (char v) => ((int)v),
+                        char (char v) => v),
+                    keyComparer: new ValueComparer<char>(
+                        bool (char v1, char v2) => v1 == v2,
+                        int (char v) => ((int)v),
+                        char (char v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(1)",
+                        size: 1),
+                    converter: new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0])))));
+            var nullableCharArrayElementType = nullableCharArray.SetElementType(typeof(char?),
+                nullable: true);
+            nullableCharArrayElementType.TypeMapping = nullableCharArray.TypeMapping.ElementTypeMapping;
+            nullableCharArrayElementType.SetComparer(new NullableValueComparer<char>(nullableCharArrayElementType.TypeMapping.Comparer));
+
+            var nullableDateOnly = runtimeEntityType.AddProperty(
+                "NullableDateOnly",
+                typeof(DateOnly?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDateOnly.SetGetter(
+                DateOnly? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateOnly(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableDateOnly(instance).HasValue));
+            nullableDateOnly.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateOnly(instance) = value;
+                    return instance;
+                });
+            nullableDateOnly.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateOnly(instance) = value;
+                    return instance;
+                });
+            nullableDateOnly.SetAccessors(
+                DateOnly? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly? (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly?>(nullableDateOnly, 112),
+                DateOnly? (IInternalEntry entry) => entry.GetCurrentValue<DateOnly?>(nullableDateOnly));
+            nullableDateOnly.SetPropertyIndexes(
+                index: 112,
+                originalValueIndex: 112,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDateOnly.TypeMapping = JetDateOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                keyComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                providerValueComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v));
+            nullableDateOnly.SetComparer(new NullableValueComparer<DateOnly>(nullableDateOnly.TypeMapping.Comparer));
+            nullableDateOnly.SetKeyComparer(new NullableValueComparer<DateOnly>(nullableDateOnly.TypeMapping.KeyComparer));
+
+            var nullableDateOnlyArray = runtimeEntityType.AddProperty(
+                "NullableDateOnlyArray",
+                typeof(DateOnly?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDateOnlyArray.SetGetter(
+                DateOnly? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateOnlyArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateOnlyArray(instance) == null);
+            nullableDateOnlyArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateOnlyArray(instance) = value;
+                    return instance;
+                });
+            nullableDateOnlyArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateOnlyArray(instance) = value;
+                    return instance;
+                });
+            nullableDateOnlyArray.SetAccessors(
+                DateOnly? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly? [] (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly? []>(nullableDateOnlyArray, 113),
+                DateOnly? [] (IInternalEntry entry) => entry.GetCurrentValue<DateOnly? []>(nullableDateOnlyArray));
+            nullableDateOnlyArray.SetPropertyIndexes(
+                index: 113,
+                originalValueIndex: 113,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDateOnlyArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<DateOnly?[], DateOnly>(new NullableValueComparer<DateOnly>(new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<DateOnly?[], DateOnly>(new NullableValueComparer<DateOnly>(new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateOnly?>(new JsonCollectionOfNullableStructsReaderWriter<DateOnly?[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<DateOnly?[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance),
+                elementMapping: JetDateOnlyTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v),
+                    keyComparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v),
+                    providerValueComparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v)));
+            var nullableDateOnlyArrayElementType = nullableDateOnlyArray.SetElementType(typeof(DateOnly?),
+                nullable: true);
+            nullableDateOnlyArrayElementType.TypeMapping = nullableDateOnlyArray.TypeMapping.ElementTypeMapping;
+            nullableDateOnlyArrayElementType.SetComparer(new NullableValueComparer<DateOnly>(nullableDateOnlyArrayElementType.TypeMapping.Comparer));
+
+            var nullableDateTime = runtimeEntityType.AddProperty(
+                "NullableDateTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDateTime.SetGetter(
+                DateTime? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateTime(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableDateTime(instance).HasValue));
+            nullableDateTime.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateTime(instance) = value;
+                    return instance;
+                });
+            nullableDateTime.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateTime(instance) = value;
+                    return instance;
+                });
+            nullableDateTime.SetAccessors(
+                DateTime? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateTime(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateTime(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime? (IInternalEntry entry) => entry.ReadOriginalValue<DateTime?>(nullableDateTime, 114),
+                DateTime? (IInternalEntry entry) => entry.GetCurrentValue<DateTime?>(nullableDateTime));
+            nullableDateTime.SetPropertyIndexes(
+                index: 114,
+                originalValueIndex: 114,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDateTime.TypeMapping = JetDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v));
+            nullableDateTime.SetComparer(new NullableValueComparer<DateTime>(nullableDateTime.TypeMapping.Comparer));
+            nullableDateTime.SetKeyComparer(new NullableValueComparer<DateTime>(nullableDateTime.TypeMapping.KeyComparer));
+
+            var nullableDateTimeArray = runtimeEntityType.AddProperty(
+                "NullableDateTimeArray",
+                typeof(DateTime?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateTimeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateTimeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDateTimeArray.SetGetter(
+                DateTime? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateTimeArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateTimeArray(instance) == null);
+            nullableDateTimeArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateTimeArray(instance) = value;
+                    return instance;
+                });
+            nullableDateTimeArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateTimeArray(instance) = value;
+                    return instance;
+                });
+            nullableDateTimeArray.SetAccessors(
+                DateTime? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateTimeArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateTimeArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime? [] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime? []>(nullableDateTimeArray, 115),
+                DateTime? [] (IInternalEntry entry) => entry.GetCurrentValue<DateTime? []>(nullableDateTimeArray));
+            nullableDateTimeArray.SetPropertyIndexes(
+                index: 115,
+                originalValueIndex: 115,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDateTimeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<DateTime?[], DateTime>(new NullableValueComparer<DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<DateTime?[], DateTime>(new NullableValueComparer<DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime?>(new JsonCollectionOfNullableStructsReaderWriter<DateTime?[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<DateTime?[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var nullableDateTimeArrayElementType = nullableDateTimeArray.SetElementType(typeof(DateTime?),
+                nullable: true);
+            nullableDateTimeArrayElementType.TypeMapping = nullableDateTimeArray.TypeMapping.ElementTypeMapping;
+            nullableDateTimeArrayElementType.SetComparer(new NullableValueComparer<DateTime>(nullableDateTimeArrayElementType.TypeMapping.Comparer));
+
+            var nullableDecimal = runtimeEntityType.AddProperty(
+                "NullableDecimal",
+                typeof(decimal?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDecimal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDecimal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDecimal.SetGetter(
+                decimal? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDecimal(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableDecimal(instance).HasValue));
+            nullableDecimal.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDecimal(instance) = value;
+                    return instance;
+                });
+            nullableDecimal.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDecimal(instance) = value;
+                    return instance;
+                });
+            nullableDecimal.SetAccessors(
+                decimal? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDecimal(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDecimal(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal? (IInternalEntry entry) => entry.ReadOriginalValue<decimal?>(nullableDecimal, 116),
+                decimal? (IInternalEntry entry) => entry.GetCurrentValue<decimal?>(nullableDecimal));
+            nullableDecimal.SetPropertyIndexes(
+                index: 116,
+                originalValueIndex: 116,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDecimal.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v));
+            nullableDecimal.SetComparer(new NullableValueComparer<decimal>(nullableDecimal.TypeMapping.Comparer));
+            nullableDecimal.SetKeyComparer(new NullableValueComparer<decimal>(nullableDecimal.TypeMapping.KeyComparer));
+
+            var nullableDecimalArray = runtimeEntityType.AddProperty(
+                "NullableDecimalArray",
+                typeof(decimal?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDecimalArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDecimalArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDecimalArray.SetGetter(
+                decimal? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDecimalArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDecimalArray(instance) == null);
+            nullableDecimalArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDecimalArray(instance) = value;
+                    return instance;
+                });
+            nullableDecimalArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDecimalArray(instance) = value;
+                    return instance;
+                });
+            nullableDecimalArray.SetAccessors(
+                decimal? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDecimalArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDecimalArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal? [] (IInternalEntry entry) => entry.ReadOriginalValue<decimal? []>(nullableDecimalArray, 117),
+                decimal? [] (IInternalEntry entry) => entry.GetCurrentValue<decimal? []>(nullableDecimalArray));
+            nullableDecimalArray.SetPropertyIndexes(
+                index: 117,
+                originalValueIndex: 117,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDecimalArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<decimal?[], decimal>(new NullableValueComparer<decimal>(new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<decimal?[], decimal>(new NullableValueComparer<decimal>(new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<decimal?>(new JsonCollectionOfNullableStructsReaderWriter<decimal?[], decimal>(
+                    JsonDecimalReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<decimal?[], decimal>(
+                    JsonDecimalReaderWriter.Instance),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    keyComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v)));
+            var nullableDecimalArrayElementType = nullableDecimalArray.SetElementType(typeof(decimal?),
+                nullable: true);
+            nullableDecimalArrayElementType.TypeMapping = nullableDecimalArray.TypeMapping.ElementTypeMapping;
+            nullableDecimalArrayElementType.SetComparer(new NullableValueComparer<decimal>(nullableDecimalArrayElementType.TypeMapping.Comparer));
+
+            var nullableDouble = runtimeEntityType.AddProperty(
+                "NullableDouble",
+                typeof(double?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDouble", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDouble>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDouble.SetGetter(
+                double? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDouble(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableDouble(instance).HasValue));
+            nullableDouble.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDouble(instance) = value;
+                    return instance;
+                });
+            nullableDouble.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDouble(instance) = value;
+                    return instance;
+                });
+            nullableDouble.SetAccessors(
+                double? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDouble(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDouble(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double? (IInternalEntry entry) => entry.ReadOriginalValue<double?>(nullableDouble, 118),
+                double? (IInternalEntry entry) => entry.GetCurrentValue<double?>(nullableDouble));
+            nullableDouble.SetPropertyIndexes(
+                index: 118,
+                originalValueIndex: 118,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDouble.TypeMapping = JetDoubleTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                providerValueComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v));
+            nullableDouble.SetComparer(new NullableValueComparer<double>(nullableDouble.TypeMapping.Comparer));
+            nullableDouble.SetKeyComparer(new NullableValueComparer<double>(nullableDouble.TypeMapping.KeyComparer));
+
+            var nullableDoubleArray = runtimeEntityType.AddProperty(
+                "NullableDoubleArray",
+                typeof(double?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDoubleArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDoubleArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDoubleArray.SetGetter(
+                double? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDoubleArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDoubleArray(instance) == null);
+            nullableDoubleArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDoubleArray(instance) = value;
+                    return instance;
+                });
+            nullableDoubleArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDoubleArray(instance) = value;
+                    return instance;
+                });
+            nullableDoubleArray.SetAccessors(
+                double? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDoubleArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDoubleArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double? [] (IInternalEntry entry) => entry.ReadOriginalValue<double? []>(nullableDoubleArray, 119),
+                double? [] (IInternalEntry entry) => entry.GetCurrentValue<double? []>(nullableDoubleArray));
+            nullableDoubleArray.SetPropertyIndexes(
+                index: 119,
+                originalValueIndex: 119,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDoubleArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<double?[], double>(new NullableValueComparer<double>(new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<double?[], double>(new NullableValueComparer<double>(new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<double?>(new JsonCollectionOfNullableStructsReaderWriter<double?[], double>(
+                    JsonDoubleReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<double?[], double>(
+                    JsonDoubleReaderWriter.Instance),
+                elementMapping: JetDoubleTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v),
+                    keyComparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v),
+                    providerValueComparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v)));
+            var nullableDoubleArrayElementType = nullableDoubleArray.SetElementType(typeof(double?),
+                nullable: true);
+            nullableDoubleArrayElementType.TypeMapping = nullableDoubleArray.TypeMapping.ElementTypeMapping;
+            nullableDoubleArrayElementType.SetComparer(new NullableValueComparer<double>(nullableDoubleArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum16 = runtimeEntityType.AddProperty(
+                "NullableEnum16",
+                typeof(CompiledModelTestBase.Enum16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum16.SetGetter(
+                CompiledModelTestBase.Enum16? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum16(instance).HasValue));
+            nullableEnum16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16(instance) = (value == null ? value : ((CompiledModelTestBase.Enum16? )(((CompiledModelTestBase.Enum16)value))));
+                    return instance;
+                });
+            nullableEnum16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16(instance) = (value == null ? value : ((CompiledModelTestBase.Enum16? )(((CompiledModelTestBase.Enum16)value))));
+                    return instance;
+                });
+            nullableEnum16.SetAccessors(
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16?>(nullableEnum16, 120),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16));
+            nullableEnum16.SetPropertyIndexes(
+                index: 120,
+                originalValueIndex: 120,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                    short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                    CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))));
+            nullableEnum16.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16.TypeMapping.Comparer));
+            nullableEnum16.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16.TypeMapping.KeyComparer));
+
+            var nullableEnum16Array = runtimeEntityType.AddProperty(
+                "NullableEnum16Array",
+                typeof(CompiledModelTestBase.Enum16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16Array.SetGetter(
+                CompiledModelTestBase.Enum16? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16Array(instance) == null);
+            nullableEnum16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum16Array.SetAccessors(
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16? []>(nullableEnum16Array, 121),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16Array));
+            nullableEnum16Array.SetPropertyIndexes(
+                index: 121,
+                originalValueIndex: 121,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var nullableEnum16ArrayElementType = nullableEnum16Array.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+            nullableEnum16ArrayElementType.TypeMapping = nullableEnum16Array.TypeMapping.ElementTypeMapping;
+            nullableEnum16ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum16AsString = runtimeEntityType.AddProperty(
+                "NullableEnum16AsString",
+                typeof(CompiledModelTestBase.Enum16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum16AsString.SetGetter(
+                CompiledModelTestBase.Enum16? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum16AsString(instance).HasValue));
+            nullableEnum16AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum16? )(((CompiledModelTestBase.Enum16)value))));
+                    return instance;
+                });
+            nullableEnum16AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum16? )(((CompiledModelTestBase.Enum16)value))));
+                    return instance;
+                });
+            nullableEnum16AsString.SetAccessors(
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16?>(nullableEnum16AsString, 122),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16AsString));
+            nullableEnum16AsString.SetPropertyIndexes(
+                index: 122,
+                originalValueIndex: 122,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16AsString.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                    short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                    CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))));
+            nullableEnum16AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16AsString.TypeMapping.Comparer));
+            nullableEnum16AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16AsString.TypeMapping.KeyComparer));
+
+            var nullableEnum16AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum16AsStringArray",
+                typeof(CompiledModelTestBase.Enum16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum16? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(instance) == null);
+            nullableEnum16AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum16AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum16AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16? []>(nullableEnum16AsStringArray, 123),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16AsStringArray));
+            nullableEnum16AsStringArray.SetPropertyIndexes(
+                index: 123,
+                originalValueIndex: 123,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var nullableEnum16AsStringArrayElementType = nullableEnum16AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+            nullableEnum16AsStringArrayElementType.TypeMapping = nullableEnum16AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnum16AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum16AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum16AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum16?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(instance) == null);
+            nullableEnum16AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum16AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum16AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16AsStringCollection, 124),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16AsStringCollection));
+            nullableEnum16AsStringCollection.SetPropertyIndexes(
+                index: 124,
+                originalValueIndex: 124,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var nullableEnum16AsStringCollectionElementType = nullableEnum16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+            nullableEnum16AsStringCollectionElementType.TypeMapping = nullableEnum16AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnum16AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum16Collection = runtimeEntityType.AddProperty(
+                "NullableEnum16Collection",
+                typeof(List<CompiledModelTestBase.Enum16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16Collection.SetGetter(
+                List<CompiledModelTestBase.Enum16?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16Collection(instance) == null);
+            nullableEnum16Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum16Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum16Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16Collection, 125),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16Collection));
+            nullableEnum16Collection.SetPropertyIndexes(
+                index: 125,
+                originalValueIndex: 125,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var nullableEnum16CollectionElementType = nullableEnum16Collection.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+            nullableEnum16CollectionElementType.TypeMapping = nullableEnum16Collection.TypeMapping.ElementTypeMapping;
+            nullableEnum16CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum32 = runtimeEntityType.AddProperty(
+                "NullableEnum32",
+                typeof(CompiledModelTestBase.Enum32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum32.SetGetter(
+                CompiledModelTestBase.Enum32? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum32(instance).HasValue));
+            nullableEnum32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32(instance) = (value == null ? value : ((CompiledModelTestBase.Enum32? )(((CompiledModelTestBase.Enum32)value))));
+                    return instance;
+                });
+            nullableEnum32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32(instance) = (value == null ? value : ((CompiledModelTestBase.Enum32? )(((CompiledModelTestBase.Enum32)value))));
+                    return instance;
+                });
+            nullableEnum32.SetAccessors(
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32?>(nullableEnum32, 126),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32));
+            nullableEnum32.SetPropertyIndexes(
+                index: 126,
+                originalValueIndex: 126,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                    CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))));
+            nullableEnum32.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32.TypeMapping.Comparer));
+            nullableEnum32.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32.TypeMapping.KeyComparer));
+
+            var nullableEnum32Array = runtimeEntityType.AddProperty(
+                "NullableEnum32Array",
+                typeof(CompiledModelTestBase.Enum32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32Array.SetGetter(
+                CompiledModelTestBase.Enum32? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32Array(instance) == null);
+            nullableEnum32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum32Array.SetAccessors(
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32? []>(nullableEnum32Array, 127),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32Array));
+            nullableEnum32Array.SetPropertyIndexes(
+                index: 127,
+                originalValueIndex: 127,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var nullableEnum32ArrayElementType = nullableEnum32Array.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+            nullableEnum32ArrayElementType.TypeMapping = nullableEnum32Array.TypeMapping.ElementTypeMapping;
+            nullableEnum32ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum32AsString = runtimeEntityType.AddProperty(
+                "NullableEnum32AsString",
+                typeof(CompiledModelTestBase.Enum32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum32AsString.SetGetter(
+                CompiledModelTestBase.Enum32? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum32AsString(instance).HasValue));
+            nullableEnum32AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum32? )(((CompiledModelTestBase.Enum32)value))));
+                    return instance;
+                });
+            nullableEnum32AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum32? )(((CompiledModelTestBase.Enum32)value))));
+                    return instance;
+                });
+            nullableEnum32AsString.SetAccessors(
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32?>(nullableEnum32AsString, 128),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32AsString));
+            nullableEnum32AsString.SetPropertyIndexes(
+                index: 128,
+                originalValueIndex: 128,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32AsString.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                    CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))));
+            nullableEnum32AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32AsString.TypeMapping.Comparer));
+            nullableEnum32AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32AsString.TypeMapping.KeyComparer));
+
+            var nullableEnum32AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum32AsStringArray",
+                typeof(CompiledModelTestBase.Enum32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum32? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(instance) == null);
+            nullableEnum32AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum32AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum32AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32? []>(nullableEnum32AsStringArray, 129),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32AsStringArray));
+            nullableEnum32AsStringArray.SetPropertyIndexes(
+                index: 129,
+                originalValueIndex: 129,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var nullableEnum32AsStringArrayElementType = nullableEnum32AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+            nullableEnum32AsStringArrayElementType.TypeMapping = nullableEnum32AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnum32AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum32AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum32AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum32?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(instance) == null);
+            nullableEnum32AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum32AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum32AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32AsStringCollection, 130),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32AsStringCollection));
+            nullableEnum32AsStringCollection.SetPropertyIndexes(
+                index: 130,
+                originalValueIndex: 130,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var nullableEnum32AsStringCollectionElementType = nullableEnum32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+            nullableEnum32AsStringCollectionElementType.TypeMapping = nullableEnum32AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnum32AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum32Collection = runtimeEntityType.AddProperty(
+                "NullableEnum32Collection",
+                typeof(List<CompiledModelTestBase.Enum32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32Collection.SetGetter(
+                List<CompiledModelTestBase.Enum32?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32Collection(instance) == null);
+            nullableEnum32Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum32Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum32Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32Collection, 131),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32Collection));
+            nullableEnum32Collection.SetPropertyIndexes(
+                index: 131,
+                originalValueIndex: 131,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var nullableEnum32CollectionElementType = nullableEnum32Collection.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+            nullableEnum32CollectionElementType.TypeMapping = nullableEnum32Collection.TypeMapping.ElementTypeMapping;
+            nullableEnum32CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum64 = runtimeEntityType.AddProperty(
+                "NullableEnum64",
+                typeof(CompiledModelTestBase.Enum64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum64.SetGetter(
+                CompiledModelTestBase.Enum64? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum64(instance).HasValue));
+            nullableEnum64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64(instance) = (value == null ? value : ((CompiledModelTestBase.Enum64? )(((CompiledModelTestBase.Enum64)value))));
+                    return instance;
+                });
+            nullableEnum64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64(instance) = (value == null ? value : ((CompiledModelTestBase.Enum64? )(((CompiledModelTestBase.Enum64)value))));
+                    return instance;
+                });
+            nullableEnum64.SetAccessors(
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64?>(nullableEnum64, 132),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64));
+            nullableEnum64.SetPropertyIndexes(
+                index: 132,
+                originalValueIndex: 132,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                    long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                    CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))));
+            nullableEnum64.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64.TypeMapping.Comparer));
+            nullableEnum64.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64.TypeMapping.KeyComparer));
+
+            var nullableEnum64Array = runtimeEntityType.AddProperty(
+                "NullableEnum64Array",
+                typeof(CompiledModelTestBase.Enum64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64Array.SetGetter(
+                CompiledModelTestBase.Enum64? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64Array(instance) == null);
+            nullableEnum64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum64Array.SetAccessors(
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64? []>(nullableEnum64Array, 133),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64Array));
+            nullableEnum64Array.SetPropertyIndexes(
+                index: 133,
+                originalValueIndex: 133,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var nullableEnum64ArrayElementType = nullableEnum64Array.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+            nullableEnum64ArrayElementType.TypeMapping = nullableEnum64Array.TypeMapping.ElementTypeMapping;
+            nullableEnum64ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum64AsString = runtimeEntityType.AddProperty(
+                "NullableEnum64AsString",
+                typeof(CompiledModelTestBase.Enum64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum64AsString.SetGetter(
+                CompiledModelTestBase.Enum64? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum64AsString(instance).HasValue));
+            nullableEnum64AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum64? )(((CompiledModelTestBase.Enum64)value))));
+                    return instance;
+                });
+            nullableEnum64AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum64? )(((CompiledModelTestBase.Enum64)value))));
+                    return instance;
+                });
+            nullableEnum64AsString.SetAccessors(
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64?>(nullableEnum64AsString, 134),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64AsString));
+            nullableEnum64AsString.SetPropertyIndexes(
+                index: 134,
+                originalValueIndex: 134,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64AsString.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                    long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                    CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))));
+            nullableEnum64AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64AsString.TypeMapping.Comparer));
+            nullableEnum64AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64AsString.TypeMapping.KeyComparer));
+
+            var nullableEnum64AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum64AsStringArray",
+                typeof(CompiledModelTestBase.Enum64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum64? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(instance) == null);
+            nullableEnum64AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum64AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum64AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64? []>(nullableEnum64AsStringArray, 135),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64AsStringArray));
+            nullableEnum64AsStringArray.SetPropertyIndexes(
+                index: 135,
+                originalValueIndex: 135,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var nullableEnum64AsStringArrayElementType = nullableEnum64AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+            nullableEnum64AsStringArrayElementType.TypeMapping = nullableEnum64AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnum64AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum64AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum64AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum64?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(instance) == null);
+            nullableEnum64AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum64AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum64AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64AsStringCollection, 136),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64AsStringCollection));
+            nullableEnum64AsStringCollection.SetPropertyIndexes(
+                index: 136,
+                originalValueIndex: 136,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var nullableEnum64AsStringCollectionElementType = nullableEnum64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+            nullableEnum64AsStringCollectionElementType.TypeMapping = nullableEnum64AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnum64AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum64Collection = runtimeEntityType.AddProperty(
+                "NullableEnum64Collection",
+                typeof(List<CompiledModelTestBase.Enum64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64Collection.SetGetter(
+                List<CompiledModelTestBase.Enum64?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64Collection(instance) == null);
+            nullableEnum64Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum64Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum64Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64Collection, 137),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64Collection));
+            nullableEnum64Collection.SetPropertyIndexes(
+                index: 137,
+                originalValueIndex: 137,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var nullableEnum64CollectionElementType = nullableEnum64Collection.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+            nullableEnum64CollectionElementType.TypeMapping = nullableEnum64Collection.TypeMapping.ElementTypeMapping;
+            nullableEnum64CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum8 = runtimeEntityType.AddProperty(
+                "NullableEnum8",
+                typeof(CompiledModelTestBase.Enum8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum8.SetGetter(
+                CompiledModelTestBase.Enum8? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum8(instance).HasValue));
+            nullableEnum8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8(instance) = (value == null ? value : ((CompiledModelTestBase.Enum8? )(((CompiledModelTestBase.Enum8)value))));
+                    return instance;
+                });
+            nullableEnum8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8(instance) = (value == null ? value : ((CompiledModelTestBase.Enum8? )(((CompiledModelTestBase.Enum8)value))));
+                    return instance;
+                });
+            nullableEnum8.SetAccessors(
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8?>(nullableEnum8, 138),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8));
+            nullableEnum8.SetPropertyIndexes(
+                index: 138,
+                originalValueIndex: 138,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                    short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                    CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))));
+            nullableEnum8.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8.TypeMapping.Comparer));
+            nullableEnum8.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8.TypeMapping.KeyComparer));
+
+            var nullableEnum8Array = runtimeEntityType.AddProperty(
+                "NullableEnum8Array",
+                typeof(CompiledModelTestBase.Enum8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8Array.SetGetter(
+                CompiledModelTestBase.Enum8? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8Array(instance) == null);
+            nullableEnum8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum8Array.SetAccessors(
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8? []>(nullableEnum8Array, 139),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8Array));
+            nullableEnum8Array.SetPropertyIndexes(
+                index: 139,
+                originalValueIndex: 139,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var nullableEnum8ArrayElementType = nullableEnum8Array.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+            nullableEnum8ArrayElementType.TypeMapping = nullableEnum8Array.TypeMapping.ElementTypeMapping;
+            nullableEnum8ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum8AsString = runtimeEntityType.AddProperty(
+                "NullableEnum8AsString",
+                typeof(CompiledModelTestBase.Enum8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum8AsString.SetGetter(
+                CompiledModelTestBase.Enum8? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum8AsString(instance).HasValue));
+            nullableEnum8AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum8? )(((CompiledModelTestBase.Enum8)value))));
+                    return instance;
+                });
+            nullableEnum8AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum8? )(((CompiledModelTestBase.Enum8)value))));
+                    return instance;
+                });
+            nullableEnum8AsString.SetAccessors(
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8?>(nullableEnum8AsString, 140),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8AsString));
+            nullableEnum8AsString.SetPropertyIndexes(
+                index: 140,
+                originalValueIndex: 140,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8AsString.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                    short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                    CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))));
+            nullableEnum8AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8AsString.TypeMapping.Comparer));
+            nullableEnum8AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8AsString.TypeMapping.KeyComparer));
+
+            var nullableEnum8AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum8AsStringArray",
+                typeof(CompiledModelTestBase.Enum8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum8? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(instance) == null);
+            nullableEnum8AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum8AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum8AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8? []>(nullableEnum8AsStringArray, 141),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8AsStringArray));
+            nullableEnum8AsStringArray.SetPropertyIndexes(
+                index: 141,
+                originalValueIndex: 141,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var nullableEnum8AsStringArrayElementType = nullableEnum8AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+            nullableEnum8AsStringArrayElementType.TypeMapping = nullableEnum8AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnum8AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum8AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum8AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum8?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(instance) == null);
+            nullableEnum8AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum8AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum8AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8AsStringCollection, 142),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8AsStringCollection));
+            nullableEnum8AsStringCollection.SetPropertyIndexes(
+                index: 142,
+                originalValueIndex: 142,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var nullableEnum8AsStringCollectionElementType = nullableEnum8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+            nullableEnum8AsStringCollectionElementType.TypeMapping = nullableEnum8AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnum8AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum8Collection = runtimeEntityType.AddProperty(
+                "NullableEnum8Collection",
+                typeof(List<CompiledModelTestBase.Enum8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8Collection.SetGetter(
+                List<CompiledModelTestBase.Enum8?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8Collection(instance) == null);
+            nullableEnum8Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum8Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum8Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8Collection, 143),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8Collection));
+            nullableEnum8Collection.SetPropertyIndexes(
+                index: 143,
+                originalValueIndex: 143,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var nullableEnum8CollectionElementType = nullableEnum8Collection.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+            nullableEnum8CollectionElementType.TypeMapping = nullableEnum8Collection.TypeMapping.ElementTypeMapping;
+            nullableEnum8CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU16 = runtimeEntityType.AddProperty(
+                "NullableEnumU16",
+                typeof(CompiledModelTestBase.EnumU16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU16.SetGetter(
+                CompiledModelTestBase.EnumU16? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU16(instance).HasValue));
+            nullableEnumU16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU16? )(((CompiledModelTestBase.EnumU16)value))));
+                    return instance;
+                });
+            nullableEnumU16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU16? )(((CompiledModelTestBase.EnumU16)value))));
+                    return instance;
+                });
+            nullableEnumU16.SetAccessors(
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16, 144),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16));
+            nullableEnumU16.SetPropertyIndexes(
+                index: 144,
+                originalValueIndex: 144,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                    int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                    CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))));
+            nullableEnumU16.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16.TypeMapping.Comparer));
+            nullableEnumU16.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16.TypeMapping.KeyComparer));
+
+            var nullableEnumU16Array = runtimeEntityType.AddProperty(
+                "NullableEnumU16Array",
+                typeof(CompiledModelTestBase.EnumU16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16Array.SetGetter(
+                CompiledModelTestBase.EnumU16? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16Array(instance) == null);
+            nullableEnumU16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16Array.SetAccessors(
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16Array, 145),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16Array));
+            nullableEnumU16Array.SetPropertyIndexes(
+                index: 145,
+                originalValueIndex: 145,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var nullableEnumU16ArrayElementType = nullableEnumU16Array.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+            nullableEnumU16ArrayElementType.TypeMapping = nullableEnumU16Array.TypeMapping.ElementTypeMapping;
+            nullableEnumU16ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU16AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsString",
+                typeof(CompiledModelTestBase.EnumU16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU16AsString.SetGetter(
+                CompiledModelTestBase.EnumU16? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU16AsString(instance).HasValue));
+            nullableEnumU16AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU16? )(((CompiledModelTestBase.EnumU16)value))));
+                    return instance;
+                });
+            nullableEnumU16AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU16? )(((CompiledModelTestBase.EnumU16)value))));
+                    return instance;
+                });
+            nullableEnumU16AsString.SetAccessors(
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16AsString, 146),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16AsString));
+            nullableEnumU16AsString.SetPropertyIndexes(
+                index: 146,
+                originalValueIndex: 146,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16AsString.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                    int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                    CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))));
+            nullableEnumU16AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16AsString.TypeMapping.Comparer));
+            nullableEnumU16AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16AsString.TypeMapping.KeyComparer));
+
+            var nullableEnumU16AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsStringArray",
+                typeof(CompiledModelTestBase.EnumU16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU16? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(instance) == null);
+            nullableEnumU16AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16AsStringArray, 147),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16AsStringArray));
+            nullableEnumU16AsStringArray.SetPropertyIndexes(
+                index: 147,
+                originalValueIndex: 147,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var nullableEnumU16AsStringArrayElementType = nullableEnumU16AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+            nullableEnumU16AsStringArrayElementType.TypeMapping = nullableEnumU16AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnumU16AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU16AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU16?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(instance) == null);
+            nullableEnumU16AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16AsStringCollection, 148),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16AsStringCollection));
+            nullableEnumU16AsStringCollection.SetPropertyIndexes(
+                index: 148,
+                originalValueIndex: 148,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var nullableEnumU16AsStringCollectionElementType = nullableEnumU16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+            nullableEnumU16AsStringCollectionElementType.TypeMapping = nullableEnumU16AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnumU16AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU16Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU16Collection",
+                typeof(List<CompiledModelTestBase.EnumU16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU16?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16Collection(instance) == null);
+            nullableEnumU16Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16Collection, 149),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16Collection));
+            nullableEnumU16Collection.SetPropertyIndexes(
+                index: 149,
+                originalValueIndex: 149,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var nullableEnumU16CollectionElementType = nullableEnumU16Collection.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+            nullableEnumU16CollectionElementType.TypeMapping = nullableEnumU16Collection.TypeMapping.ElementTypeMapping;
+            nullableEnumU16CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU32 = runtimeEntityType.AddProperty(
+                "NullableEnumU32",
+                typeof(CompiledModelTestBase.EnumU32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU32.SetGetter(
+                CompiledModelTestBase.EnumU32? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU32(instance).HasValue));
+            nullableEnumU32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU32? )(((CompiledModelTestBase.EnumU32)value))));
+                    return instance;
+                });
+            nullableEnumU32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU32? )(((CompiledModelTestBase.EnumU32)value))));
+                    return instance;
+                });
+            nullableEnumU32.SetAccessors(
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32, 150),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32));
+            nullableEnumU32.SetPropertyIndexes(
+                index: 150,
+                originalValueIndex: 150,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                    long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                    CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))));
+            nullableEnumU32.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32.TypeMapping.Comparer));
+            nullableEnumU32.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32.TypeMapping.KeyComparer));
+
+            var nullableEnumU32Array = runtimeEntityType.AddProperty(
+                "NullableEnumU32Array",
+                typeof(CompiledModelTestBase.EnumU32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32Array.SetGetter(
+                CompiledModelTestBase.EnumU32? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32Array(instance) == null);
+            nullableEnumU32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32Array.SetAccessors(
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32Array, 151),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32Array));
+            nullableEnumU32Array.SetPropertyIndexes(
+                index: 151,
+                originalValueIndex: 151,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var nullableEnumU32ArrayElementType = nullableEnumU32Array.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+            nullableEnumU32ArrayElementType.TypeMapping = nullableEnumU32Array.TypeMapping.ElementTypeMapping;
+            nullableEnumU32ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU32AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsString",
+                typeof(CompiledModelTestBase.EnumU32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU32AsString.SetGetter(
+                CompiledModelTestBase.EnumU32? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU32AsString(instance).HasValue));
+            nullableEnumU32AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU32? )(((CompiledModelTestBase.EnumU32)value))));
+                    return instance;
+                });
+            nullableEnumU32AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU32? )(((CompiledModelTestBase.EnumU32)value))));
+                    return instance;
+                });
+            nullableEnumU32AsString.SetAccessors(
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32AsString, 152),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32AsString));
+            nullableEnumU32AsString.SetPropertyIndexes(
+                index: 152,
+                originalValueIndex: 152,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32AsString.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                    long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                    CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))));
+            nullableEnumU32AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32AsString.TypeMapping.Comparer));
+            nullableEnumU32AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32AsString.TypeMapping.KeyComparer));
+
+            var nullableEnumU32AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsStringArray",
+                typeof(CompiledModelTestBase.EnumU32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU32? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(instance) == null);
+            nullableEnumU32AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32AsStringArray, 153),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32AsStringArray));
+            nullableEnumU32AsStringArray.SetPropertyIndexes(
+                index: 153,
+                originalValueIndex: 153,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var nullableEnumU32AsStringArrayElementType = nullableEnumU32AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+            nullableEnumU32AsStringArrayElementType.TypeMapping = nullableEnumU32AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnumU32AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU32AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU32?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(instance) == null);
+            nullableEnumU32AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32AsStringCollection, 154),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32AsStringCollection));
+            nullableEnumU32AsStringCollection.SetPropertyIndexes(
+                index: 154,
+                originalValueIndex: 154,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var nullableEnumU32AsStringCollectionElementType = nullableEnumU32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+            nullableEnumU32AsStringCollectionElementType.TypeMapping = nullableEnumU32AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnumU32AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU32Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU32Collection",
+                typeof(List<CompiledModelTestBase.EnumU32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU32?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32Collection(instance) == null);
+            nullableEnumU32Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32Collection, 155),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32Collection));
+            nullableEnumU32Collection.SetPropertyIndexes(
+                index: 155,
+                originalValueIndex: 155,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var nullableEnumU32CollectionElementType = nullableEnumU32Collection.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+            nullableEnumU32CollectionElementType.TypeMapping = nullableEnumU32Collection.TypeMapping.ElementTypeMapping;
+            nullableEnumU32CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU64 = runtimeEntityType.AddProperty(
+                "NullableEnumU64",
+                typeof(CompiledModelTestBase.EnumU64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU64.SetGetter(
+                CompiledModelTestBase.EnumU64? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU64(instance).HasValue));
+            nullableEnumU64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU64? )(((CompiledModelTestBase.EnumU64)value))));
+                    return instance;
+                });
+            nullableEnumU64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU64? )(((CompiledModelTestBase.EnumU64)value))));
+                    return instance;
+                });
+            nullableEnumU64.SetAccessors(
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64, 156),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64));
+            nullableEnumU64.SetPropertyIndexes(
+                index: 156,
+                originalValueIndex: 156,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                    decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                    CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))));
+            nullableEnumU64.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64.TypeMapping.Comparer));
+            nullableEnumU64.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64.TypeMapping.KeyComparer));
+
+            var nullableEnumU64Array = runtimeEntityType.AddProperty(
+                "NullableEnumU64Array",
+                typeof(CompiledModelTestBase.EnumU64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64Array.SetGetter(
+                CompiledModelTestBase.EnumU64? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64Array(instance) == null);
+            nullableEnumU64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64Array.SetAccessors(
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64Array, 157),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64Array));
+            nullableEnumU64Array.SetPropertyIndexes(
+                index: 157,
+                originalValueIndex: 157,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var nullableEnumU64ArrayElementType = nullableEnumU64Array.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+            nullableEnumU64ArrayElementType.TypeMapping = nullableEnumU64Array.TypeMapping.ElementTypeMapping;
+            nullableEnumU64ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU64AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsString",
+                typeof(CompiledModelTestBase.EnumU64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU64AsString.SetGetter(
+                CompiledModelTestBase.EnumU64? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU64AsString(instance).HasValue));
+            nullableEnumU64AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU64? )(((CompiledModelTestBase.EnumU64)value))));
+                    return instance;
+                });
+            nullableEnumU64AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU64? )(((CompiledModelTestBase.EnumU64)value))));
+                    return instance;
+                });
+            nullableEnumU64AsString.SetAccessors(
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64AsString, 158),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64AsString));
+            nullableEnumU64AsString.SetPropertyIndexes(
+                index: 158,
+                originalValueIndex: 158,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64AsString.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                    decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                    CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))));
+            nullableEnumU64AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64AsString.TypeMapping.Comparer));
+            nullableEnumU64AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64AsString.TypeMapping.KeyComparer));
+
+            var nullableEnumU64AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsStringArray",
+                typeof(CompiledModelTestBase.EnumU64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU64? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(instance) == null);
+            nullableEnumU64AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64AsStringArray, 159),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64AsStringArray));
+            nullableEnumU64AsStringArray.SetPropertyIndexes(
+                index: 159,
+                originalValueIndex: 159,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var nullableEnumU64AsStringArrayElementType = nullableEnumU64AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+            nullableEnumU64AsStringArrayElementType.TypeMapping = nullableEnumU64AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnumU64AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU64AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU64?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(instance) == null);
+            nullableEnumU64AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64AsStringCollection, 160),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64AsStringCollection));
+            nullableEnumU64AsStringCollection.SetPropertyIndexes(
+                index: 160,
+                originalValueIndex: 160,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var nullableEnumU64AsStringCollectionElementType = nullableEnumU64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+            nullableEnumU64AsStringCollectionElementType.TypeMapping = nullableEnumU64AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnumU64AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU64Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU64Collection",
+                typeof(List<CompiledModelTestBase.EnumU64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU64?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64Collection(instance) == null);
+            nullableEnumU64Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64Collection, 161),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64Collection));
+            nullableEnumU64Collection.SetPropertyIndexes(
+                index: 161,
+                originalValueIndex: 161,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var nullableEnumU64CollectionElementType = nullableEnumU64Collection.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+            nullableEnumU64CollectionElementType.TypeMapping = nullableEnumU64Collection.TypeMapping.ElementTypeMapping;
+            nullableEnumU64CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU8 = runtimeEntityType.AddProperty(
+                "NullableEnumU8",
+                typeof(CompiledModelTestBase.EnumU8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU8.SetGetter(
+                CompiledModelTestBase.EnumU8? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU8(instance).HasValue));
+            nullableEnumU8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU8? )(((CompiledModelTestBase.EnumU8)value))));
+                    return instance;
+                });
+            nullableEnumU8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU8? )(((CompiledModelTestBase.EnumU8)value))));
+                    return instance;
+                });
+            nullableEnumU8.SetAccessors(
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8, 162),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8));
+            nullableEnumU8.SetPropertyIndexes(
+                index: 162,
+                originalValueIndex: 162,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                    byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                    CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))));
+            nullableEnumU8.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8.TypeMapping.Comparer));
+            nullableEnumU8.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8.TypeMapping.KeyComparer));
+
+            var nullableEnumU8Array = runtimeEntityType.AddProperty(
+                "NullableEnumU8Array",
+                typeof(CompiledModelTestBase.EnumU8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8Array.SetGetter(
+                CompiledModelTestBase.EnumU8? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8Array(instance) == null);
+            nullableEnumU8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8Array.SetAccessors(
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8Array, 163),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8Array));
+            nullableEnumU8Array.SetPropertyIndexes(
+                index: 163,
+                originalValueIndex: 163,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var nullableEnumU8ArrayElementType = nullableEnumU8Array.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+            nullableEnumU8ArrayElementType.TypeMapping = nullableEnumU8Array.TypeMapping.ElementTypeMapping;
+            nullableEnumU8ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU8AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsString",
+                typeof(CompiledModelTestBase.EnumU8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU8AsString.SetGetter(
+                CompiledModelTestBase.EnumU8? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU8AsString(instance).HasValue));
+            nullableEnumU8AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU8? )(((CompiledModelTestBase.EnumU8)value))));
+                    return instance;
+                });
+            nullableEnumU8AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU8? )(((CompiledModelTestBase.EnumU8)value))));
+                    return instance;
+                });
+            nullableEnumU8AsString.SetAccessors(
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8AsString, 164),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8AsString));
+            nullableEnumU8AsString.SetPropertyIndexes(
+                index: 164,
+                originalValueIndex: 164,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8AsString.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                    byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                    CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))));
+            nullableEnumU8AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8AsString.TypeMapping.Comparer));
+            nullableEnumU8AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8AsString.TypeMapping.KeyComparer));
+
+            var nullableEnumU8AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsStringArray",
+                typeof(CompiledModelTestBase.EnumU8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU8? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(instance) == null);
+            nullableEnumU8AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8AsStringArray, 165),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8AsStringArray));
+            nullableEnumU8AsStringArray.SetPropertyIndexes(
+                index: 165,
+                originalValueIndex: 165,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var nullableEnumU8AsStringArrayElementType = nullableEnumU8AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+            nullableEnumU8AsStringArrayElementType.TypeMapping = nullableEnumU8AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnumU8AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU8AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU8?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(instance) == null);
+            nullableEnumU8AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8AsStringCollection, 166),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8AsStringCollection));
+            nullableEnumU8AsStringCollection.SetPropertyIndexes(
+                index: 166,
+                originalValueIndex: 166,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var nullableEnumU8AsStringCollectionElementType = nullableEnumU8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+            nullableEnumU8AsStringCollectionElementType.TypeMapping = nullableEnumU8AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnumU8AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU8Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU8Collection",
+                typeof(List<CompiledModelTestBase.EnumU8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU8?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8Collection(instance) == null);
+            nullableEnumU8Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8Collection, 167),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8Collection));
+            nullableEnumU8Collection.SetPropertyIndexes(
+                index: 167,
+                originalValueIndex: 167,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var nullableEnumU8CollectionElementType = nullableEnumU8Collection.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+            nullableEnumU8CollectionElementType.TypeMapping = nullableEnumU8Collection.TypeMapping.ElementTypeMapping;
+            nullableEnumU8CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8CollectionElementType.TypeMapping.Comparer));
+
+            var nullableFloat = runtimeEntityType.AddProperty(
+                "NullableFloat",
+                typeof(float?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableFloat", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableFloat>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableFloat.SetGetter(
+                float? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableFloat(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableFloat(instance).HasValue));
+            nullableFloat.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableFloat(instance) = value;
+                    return instance;
+                });
+            nullableFloat.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableFloat(instance) = value;
+                    return instance;
+                });
+            nullableFloat.SetAccessors(
+                float? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableFloat(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableFloat(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float? (IInternalEntry entry) => entry.ReadOriginalValue<float?>(nullableFloat, 168),
+                float? (IInternalEntry entry) => entry.GetCurrentValue<float?>(nullableFloat));
+            nullableFloat.SetPropertyIndexes(
+                index: 168,
+                originalValueIndex: 168,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableFloat.TypeMapping = JetFloatTypeMapping.Default.Clone(
+                comparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v),
+                keyComparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v),
+                providerValueComparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v));
+            nullableFloat.SetComparer(new NullableValueComparer<float>(nullableFloat.TypeMapping.Comparer));
+            nullableFloat.SetKeyComparer(new NullableValueComparer<float>(nullableFloat.TypeMapping.KeyComparer));
+
+            var nullableFloatArray = runtimeEntityType.AddProperty(
+                "NullableFloatArray",
+                typeof(float?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableFloatArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableFloatArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableFloatArray.SetGetter(
+                float? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableFloatArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableFloatArray(instance) == null);
+            nullableFloatArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableFloatArray(instance) = value;
+                    return instance;
+                });
+            nullableFloatArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableFloatArray(instance) = value;
+                    return instance;
+                });
+            nullableFloatArray.SetAccessors(
+                float? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableFloatArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableFloatArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float? [] (IInternalEntry entry) => entry.ReadOriginalValue<float? []>(nullableFloatArray, 169),
+                float? [] (IInternalEntry entry) => entry.GetCurrentValue<float? []>(nullableFloatArray));
+            nullableFloatArray.SetPropertyIndexes(
+                index: 169,
+                originalValueIndex: 169,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableFloatArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<float?[], float>(new NullableValueComparer<float>(new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<float?[], float>(new NullableValueComparer<float>(new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<float?>(new JsonCollectionOfNullableStructsReaderWriter<float?[], float>(
+                    JsonFloatReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<float?[], float>(
+                    JsonFloatReaderWriter.Instance),
+                elementMapping: JetFloatTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v),
+                    keyComparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v),
+                    providerValueComparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v)));
+            var nullableFloatArrayElementType = nullableFloatArray.SetElementType(typeof(float?),
+                nullable: true);
+            nullableFloatArrayElementType.TypeMapping = nullableFloatArray.TypeMapping.ElementTypeMapping;
+            nullableFloatArrayElementType.SetComparer(new NullableValueComparer<float>(nullableFloatArrayElementType.TypeMapping.Comparer));
+
+            var nullableGuid = runtimeEntityType.AddProperty(
+                "NullableGuid",
+                typeof(Guid?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableGuid", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableGuid>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableGuid.SetGetter(
+                Guid? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableGuid(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableGuid(instance).HasValue));
+            nullableGuid.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableGuid(instance) = value;
+                    return instance;
+                });
+            nullableGuid.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableGuid(instance) = value;
+                    return instance;
+                });
+            nullableGuid.SetAccessors(
+                Guid? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableGuid(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableGuid(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid? (IInternalEntry entry) => entry.ReadOriginalValue<Guid?>(nullableGuid, 170),
+                Guid? (IInternalEntry entry) => entry.GetCurrentValue<Guid?>(nullableGuid));
+            nullableGuid.SetPropertyIndexes(
+                index: 170,
+                originalValueIndex: 170,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableGuid.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            nullableGuid.SetComparer(new NullableValueComparer<Guid>(nullableGuid.TypeMapping.Comparer));
+            nullableGuid.SetKeyComparer(new NullableValueComparer<Guid>(nullableGuid.TypeMapping.KeyComparer));
+
+            var nullableGuidArray = runtimeEntityType.AddProperty(
+                "NullableGuidArray",
+                typeof(Guid?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableGuidArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableGuidArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableGuidArray.SetGetter(
+                Guid? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableGuidArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableGuidArray(instance) == null);
+            nullableGuidArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableGuidArray(instance) = value;
+                    return instance;
+                });
+            nullableGuidArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableGuidArray(instance) = value;
+                    return instance;
+                });
+            nullableGuidArray.SetAccessors(
+                Guid? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableGuidArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableGuidArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid? [] (IInternalEntry entry) => entry.ReadOriginalValue<Guid? []>(nullableGuidArray, 171),
+                Guid? [] (IInternalEntry entry) => entry.GetCurrentValue<Guid? []>(nullableGuidArray));
+            nullableGuidArray.SetPropertyIndexes(
+                index: 171,
+                originalValueIndex: 171,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableGuidArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<Guid?[], Guid>(new NullableValueComparer<Guid>(new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<Guid?[], Guid>(new NullableValueComparer<Guid>(new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<Guid?>(new JsonCollectionOfNullableStructsReaderWriter<Guid?[], Guid>(
+                    JsonGuidReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<Guid?[], Guid>(
+                    JsonGuidReaderWriter.Instance),
+                elementMapping: JetGuidTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v),
+                    keyComparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v),
+                    providerValueComparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v)));
+            var nullableGuidArrayElementType = nullableGuidArray.SetElementType(typeof(Guid?),
+                nullable: true);
+            nullableGuidArrayElementType.TypeMapping = nullableGuidArray.TypeMapping.ElementTypeMapping;
+            nullableGuidArrayElementType.SetComparer(new NullableValueComparer<Guid>(nullableGuidArrayElementType.TypeMapping.Comparer));
+
+            var nullableIPAddress = runtimeEntityType.AddProperty(
+                "NullableIPAddress",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableIPAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableIPAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableIPAddress.SetGetter(
+                IPAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableIPAddress(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableIPAddress(instance) == null);
+            nullableIPAddress.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableIPAddress(instance) = value;
+                    return instance;
+                });
+            nullableIPAddress.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableIPAddress(instance) = value;
+                    return instance;
+                });
+            nullableIPAddress.SetAccessors(
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableIPAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableIPAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress>(nullableIPAddress, 172),
+                IPAddress (IInternalEntry entry) => entry.GetCurrentValue<IPAddress>(nullableIPAddress));
+            nullableIPAddress.SetPropertyIndexes(
+                index: 172,
+                originalValueIndex: 172,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableIPAddress.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(45)",
+                    size: 45),
+                converter: new ValueConverter<IPAddress, string>(
+                    string (IPAddress v) => ((object)v).ToString(),
+                    IPAddress (string v) => IPAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v))));
+
+            var nullableIPAddressArray = runtimeEntityType.AddProperty(
+                "NullableIPAddressArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableIPAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableIPAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableIPAddressArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableIPAddressArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableIPAddressArray(instance) == null);
+            nullableIPAddressArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableIPAddressArray(instance) = value;
+                    return instance;
+                });
+            nullableIPAddressArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableIPAddressArray(instance) = value;
+                    return instance;
+                });
+            nullableIPAddressArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableIPAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableIPAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(nullableIPAddressArray, 173),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(nullableIPAddressArray));
+            nullableIPAddressArray.SetPropertyIndexes(
+                index: 173,
+                originalValueIndex: 173,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableIPAddressArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var nullableIPAddressArrayElementType = nullableIPAddressArray.SetElementType(typeof(IPAddress),
+                nullable: true);
+            nullableIPAddressArrayElementType.TypeMapping = nullableIPAddressArray.TypeMapping.ElementTypeMapping;
+
+            var nullableInt16 = runtimeEntityType.AddProperty(
+                "NullableInt16",
+                typeof(short?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt16.SetGetter(
+                short? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableInt16(instance).HasValue));
+            nullableInt16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt16(instance) = value;
+                    return instance;
+                });
+            nullableInt16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt16(instance) = value;
+                    return instance;
+                });
+            nullableInt16.SetAccessors(
+                short? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short? (IInternalEntry entry) => entry.ReadOriginalValue<short?>(nullableInt16, 174),
+                short? (IInternalEntry entry) => entry.GetCurrentValue<short?>(nullableInt16));
+            nullableInt16.SetPropertyIndexes(
+                index: 174,
+                originalValueIndex: 174,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt16.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                keyComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v));
+            nullableInt16.SetComparer(new NullableValueComparer<short>(nullableInt16.TypeMapping.Comparer));
+            nullableInt16.SetKeyComparer(new NullableValueComparer<short>(nullableInt16.TypeMapping.KeyComparer));
+
+            var nullableInt16Array = runtimeEntityType.AddProperty(
+                "NullableInt16Array",
+                typeof(short?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt16Array.SetGetter(
+                short? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt16Array(instance) == null);
+            nullableInt16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt16Array(instance) = value;
+                    return instance;
+                });
+            nullableInt16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt16Array(instance) = value;
+                    return instance;
+                });
+            nullableInt16Array.SetAccessors(
+                short? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short? [] (IInternalEntry entry) => entry.ReadOriginalValue<short? []>(nullableInt16Array, 175),
+                short? [] (IInternalEntry entry) => entry.GetCurrentValue<short? []>(nullableInt16Array));
+            nullableInt16Array.SetPropertyIndexes(
+                index: 175,
+                originalValueIndex: 175,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<short?[], short>(new NullableValueComparer<short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<short?[], short>(new NullableValueComparer<short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short?>(new JsonCollectionOfNullableStructsReaderWriter<short?[], short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<short?[], short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var nullableInt16ArrayElementType = nullableInt16Array.SetElementType(typeof(short?),
+                nullable: true);
+            nullableInt16ArrayElementType.TypeMapping = nullableInt16Array.TypeMapping.ElementTypeMapping;
+            nullableInt16ArrayElementType.SetComparer(new NullableValueComparer<short>(nullableInt16ArrayElementType.TypeMapping.Comparer));
+
+            var nullableInt32 = runtimeEntityType.AddProperty(
+                "NullableInt32",
+                typeof(int?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt32.SetGetter(
+                int? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableInt32(instance).HasValue));
+            nullableInt32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt32(instance) = value;
+                    return instance;
+                });
+            nullableInt32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt32(instance) = value;
+                    return instance;
+                });
+            nullableInt32.SetAccessors(
+                int? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? (IInternalEntry entry) => entry.ReadOriginalValue<int?>(nullableInt32, 176),
+                int? (IInternalEntry entry) => entry.GetCurrentValue<int?>(nullableInt32));
+            nullableInt32.SetPropertyIndexes(
+                index: 176,
+                originalValueIndex: 176,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt32.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+            nullableInt32.SetComparer(new NullableValueComparer<int>(nullableInt32.TypeMapping.Comparer));
+            nullableInt32.SetKeyComparer(new NullableValueComparer<int>(nullableInt32.TypeMapping.KeyComparer));
+
+            var nullableInt32Array = runtimeEntityType.AddProperty(
+                "NullableInt32Array",
+                typeof(int?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt32Array.SetGetter(
+                int? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt32Array(instance) == null);
+            nullableInt32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt32Array(instance) = value;
+                    return instance;
+                });
+            nullableInt32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt32Array(instance) = value;
+                    return instance;
+                });
+            nullableInt32Array.SetAccessors(
+                int? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? [] (IInternalEntry entry) => entry.ReadOriginalValue<int? []>(nullableInt32Array, 177),
+                int? [] (IInternalEntry entry) => entry.GetCurrentValue<int? []>(nullableInt32Array));
+            nullableInt32Array.SetPropertyIndexes(
+                index: 177,
+                originalValueIndex: 177,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<int?[], int>(new NullableValueComparer<int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<int?[], int>(new NullableValueComparer<int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<int?>(new JsonCollectionOfNullableStructsReaderWriter<int?[], int>(
+                    JsonInt32ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<int?[], int>(
+                    JsonInt32ReaderWriter.Instance),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v)));
+            var nullableInt32ArrayElementType = nullableInt32Array.SetElementType(typeof(int?),
+                nullable: true);
+            nullableInt32ArrayElementType.TypeMapping = nullableInt32Array.TypeMapping.ElementTypeMapping;
+            nullableInt32ArrayElementType.SetComparer(new NullableValueComparer<int>(nullableInt32ArrayElementType.TypeMapping.Comparer));
+
+            var nullableInt64 = runtimeEntityType.AddProperty(
+                "NullableInt64",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt64.SetGetter(
+                long? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableInt64(instance).HasValue));
+            nullableInt64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt64(instance) = value;
+                    return instance;
+                });
+            nullableInt64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt64(instance) = value;
+                    return instance;
+                });
+            nullableInt64.SetAccessors(
+                long? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(nullableInt64, 178),
+                long? (IInternalEntry entry) => entry.GetCurrentValue<long?>(nullableInt64));
+            nullableInt64.SetPropertyIndexes(
+                index: 178,
+                originalValueIndex: 178,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt64.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            nullableInt64.SetComparer(new NullableValueComparer<long>(nullableInt64.TypeMapping.Comparer));
+            nullableInt64.SetKeyComparer(new NullableValueComparer<long>(nullableInt64.TypeMapping.KeyComparer));
+
+            var nullableInt64Array = runtimeEntityType.AddProperty(
+                "NullableInt64Array",
+                typeof(long?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt64Array.SetGetter(
+                long? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt64Array(instance) == null);
+            nullableInt64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt64Array(instance) = value;
+                    return instance;
+                });
+            nullableInt64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt64Array(instance) = value;
+                    return instance;
+                });
+            nullableInt64Array.SetAccessors(
+                long? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long? [] (IInternalEntry entry) => entry.ReadOriginalValue<long? []>(nullableInt64Array, 179),
+                long? [] (IInternalEntry entry) => entry.GetCurrentValue<long? []>(nullableInt64Array));
+            nullableInt64Array.SetPropertyIndexes(
+                index: 179,
+                originalValueIndex: 179,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<long?[], long>(new NullableValueComparer<long>(new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<long?[], long>(new NullableValueComparer<long>(new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<long?>(new JsonCollectionOfNullableStructsReaderWriter<long?[], long>(
+                    JsonInt64ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<long?[], long>(
+                    JsonInt64ReaderWriter.Instance),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    keyComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v)));
+            var nullableInt64ArrayElementType = nullableInt64Array.SetElementType(typeof(long?),
+                nullable: true);
+            nullableInt64ArrayElementType.TypeMapping = nullableInt64Array.TypeMapping.ElementTypeMapping;
+            nullableInt64ArrayElementType.SetComparer(new NullableValueComparer<long>(nullableInt64ArrayElementType.TypeMapping.Comparer));
+
+            var nullableInt8 = runtimeEntityType.AddProperty(
+                "NullableInt8",
+                typeof(sbyte?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt8.SetGetter(
+                sbyte? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableInt8(instance).HasValue));
+            nullableInt8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt8(instance) = value;
+                    return instance;
+                });
+            nullableInt8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt8(instance) = value;
+                    return instance;
+                });
+            nullableInt8.SetAccessors(
+                sbyte? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte? (IInternalEntry entry) => entry.ReadOriginalValue<sbyte?>(nullableInt8, 180),
+                sbyte? (IInternalEntry entry) => entry.GetCurrentValue<sbyte?>(nullableInt8));
+            nullableInt8.SetPropertyIndexes(
+                index: 180,
+                originalValueIndex: 180,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt8.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v),
+                keyComparer: new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<sbyte, short>(
+                    short (sbyte v) => ((short)v),
+                    sbyte (short v) => ((sbyte)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<sbyte, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<sbyte, short>(
+                        short (sbyte v) => ((short)v),
+                        sbyte (short v) => ((sbyte)v))));
+            nullableInt8.SetComparer(new NullableValueComparer<sbyte>(nullableInt8.TypeMapping.Comparer));
+            nullableInt8.SetKeyComparer(new NullableValueComparer<sbyte>(nullableInt8.TypeMapping.KeyComparer));
+
+            var nullableInt8Array = runtimeEntityType.AddProperty(
+                "NullableInt8Array",
+                typeof(sbyte?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt8Array.SetGetter(
+                sbyte? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt8Array(instance) == null);
+            nullableInt8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt8Array(instance) = value;
+                    return instance;
+                });
+            nullableInt8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt8Array(instance) = value;
+                    return instance;
+                });
+            nullableInt8Array.SetAccessors(
+                sbyte? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte? [] (IInternalEntry entry) => entry.ReadOriginalValue<sbyte? []>(nullableInt8Array, 181),
+                sbyte? [] (IInternalEntry entry) => entry.GetCurrentValue<sbyte? []>(nullableInt8Array));
+            nullableInt8Array.SetPropertyIndexes(
+                index: 181,
+                originalValueIndex: 181,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<sbyte?[], sbyte>(new NullableValueComparer<sbyte>(new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<sbyte?[], sbyte>(new NullableValueComparer<sbyte>(new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<sbyte?>(new JsonCollectionOfNullableStructsReaderWriter<sbyte?[], sbyte>(
+                    new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<sbyte?[], sbyte>(
+                    new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<sbyte>(
+                        bool (sbyte v1, sbyte v2) => v1 == v2,
+                        int (sbyte v) => ((int)v),
+                        sbyte (sbyte v) => v),
+                    keyComparer: new ValueComparer<sbyte>(
+                        bool (sbyte v1, sbyte v2) => v1 == v2,
+                        int (sbyte v) => ((int)v),
+                        sbyte (sbyte v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<sbyte, short>(
+                        short (sbyte v) => ((short)v),
+                        sbyte (short v) => ((sbyte)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v)))));
+            var nullableInt8ArrayElementType = nullableInt8Array.SetElementType(typeof(sbyte?),
+                nullable: true);
+            nullableInt8ArrayElementType.TypeMapping = nullableInt8Array.TypeMapping.ElementTypeMapping;
+            nullableInt8ArrayElementType.SetComparer(new NullableValueComparer<sbyte>(nullableInt8ArrayElementType.TypeMapping.Comparer));
+
+            var nullablePhysicalAddress = runtimeEntityType.AddProperty(
+                "NullablePhysicalAddress",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullablePhysicalAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullablePhysicalAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullablePhysicalAddress.SetGetter(
+                PhysicalAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullablePhysicalAddress(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullablePhysicalAddress(instance) == null);
+            nullablePhysicalAddress.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullablePhysicalAddress(instance) = value;
+                    return instance;
+                });
+            nullablePhysicalAddress.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullablePhysicalAddress(instance) = value;
+                    return instance;
+                });
+            nullablePhysicalAddress.SetAccessors(
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullablePhysicalAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullablePhysicalAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress>(nullablePhysicalAddress, 182),
+                PhysicalAddress (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress>(nullablePhysicalAddress));
+            nullablePhysicalAddress.SetPropertyIndexes(
+                index: 182,
+                originalValueIndex: 182,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullablePhysicalAddress.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(20)",
+                    size: 20),
+                converter: new ValueConverter<PhysicalAddress, string>(
+                    string (PhysicalAddress v) => ((object)v).ToString(),
+                    PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v))));
+
+            var nullablePhysicalAddressArray = runtimeEntityType.AddProperty(
+                "NullablePhysicalAddressArray",
+                typeof(PhysicalAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullablePhysicalAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullablePhysicalAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullablePhysicalAddressArray.SetGetter(
+                PhysicalAddress[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(instance) == null);
+            nullablePhysicalAddressArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(instance) = value;
+                    return instance;
+                });
+            nullablePhysicalAddressArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(instance) = value;
+                    return instance;
+                });
+            nullablePhysicalAddressArray.SetAccessors(
+                PhysicalAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress[]>(nullablePhysicalAddressArray, 183),
+                PhysicalAddress[] (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress[]>(nullablePhysicalAddressArray));
+            nullablePhysicalAddressArray.SetPropertyIndexes(
+                index: 183,
+                originalValueIndex: 183,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullablePhysicalAddressArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<PhysicalAddress[], PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<PhysicalAddress[], PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<PhysicalAddress>(new JsonCollectionOfReferencesReaderWriter<PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<PhysicalAddress>(
+                        bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                        PhysicalAddress (PhysicalAddress v) => v),
+                    keyComparer: new ValueComparer<PhysicalAddress>(
+                        bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                        PhysicalAddress (PhysicalAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(20)",
+                        size: 20),
+                    converter: new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v)))));
+            var nullablePhysicalAddressArrayElementType = nullablePhysicalAddressArray.SetElementType(typeof(PhysicalAddress),
+                nullable: true);
+            nullablePhysicalAddressArrayElementType.TypeMapping = nullablePhysicalAddressArray.TypeMapping.ElementTypeMapping;
+
+            var nullableString = runtimeEntityType.AddProperty(
+                "NullableString",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableString.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableString(instance) == null);
+            nullableString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableString(instance) = value;
+                    return instance;
+                });
+            nullableString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableString(instance) = value;
+                    return instance;
+                });
+            nullableString.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(nullableString, 184),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(nullableString));
+            nullableString.SetPropertyIndexes(
+                index: 184,
+                originalValueIndex: 184,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var nullableStringArray = runtimeEntityType.AddProperty(
+                "NullableStringArray",
+                typeof(string[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableStringArray.SetGetter(
+                string[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableStringArray(instance) == null);
+            nullableStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableStringArray(instance) = value;
+                    return instance;
+                });
+            nullableStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableStringArray(instance) = value;
+                    return instance;
+                });
+            nullableStringArray.SetAccessors(
+                string[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string[] (IInternalEntry entry) => entry.ReadOriginalValue<string[]>(nullableStringArray, 185),
+                string[] (IInternalEntry entry) => entry.GetCurrentValue<string[]>(nullableStringArray));
+            nullableStringArray.SetPropertyIndexes(
+                index: 185,
+                originalValueIndex: 185,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<string[], string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<string[], string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var nullableStringArrayElementType = nullableStringArray.SetElementType(typeof(string),
+                nullable: true);
+            nullableStringArrayElementType.TypeMapping = nullableStringArray.TypeMapping.ElementTypeMapping;
+
+            var nullableTimeOnly = runtimeEntityType.AddProperty(
+                "NullableTimeOnly",
+                typeof(TimeOnly?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableTimeOnly.SetGetter(
+                TimeOnly? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeOnly(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableTimeOnly(instance).HasValue));
+            nullableTimeOnly.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeOnly(instance) = value;
+                    return instance;
+                });
+            nullableTimeOnly.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeOnly(instance) = value;
+                    return instance;
+                });
+            nullableTimeOnly.SetAccessors(
+                TimeOnly? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly? (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly?>(nullableTimeOnly, 186),
+                TimeOnly? (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly?>(nullableTimeOnly));
+            nullableTimeOnly.SetPropertyIndexes(
+                index: 186,
+                originalValueIndex: 186,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableTimeOnly.TypeMapping = JetTimeOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v));
+            nullableTimeOnly.SetComparer(new NullableValueComparer<TimeOnly>(nullableTimeOnly.TypeMapping.Comparer));
+            nullableTimeOnly.SetKeyComparer(new NullableValueComparer<TimeOnly>(nullableTimeOnly.TypeMapping.KeyComparer));
+
+            var nullableTimeOnlyArray = runtimeEntityType.AddProperty(
+                "NullableTimeOnlyArray",
+                typeof(TimeOnly?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableTimeOnlyArray.SetGetter(
+                TimeOnly? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeOnlyArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeOnlyArray(instance) == null);
+            nullableTimeOnlyArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeOnlyArray(instance) = value;
+                    return instance;
+                });
+            nullableTimeOnlyArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeOnlyArray(instance) = value;
+                    return instance;
+                });
+            nullableTimeOnlyArray.SetAccessors(
+                TimeOnly? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly? [] (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly? []>(nullableTimeOnlyArray, 187),
+                TimeOnly? [] (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly? []>(nullableTimeOnlyArray));
+            nullableTimeOnlyArray.SetPropertyIndexes(
+                index: 187,
+                originalValueIndex: 187,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableTimeOnlyArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<TimeOnly?[], TimeOnly>(new NullableValueComparer<TimeOnly>(new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<TimeOnly?[], TimeOnly>(new NullableValueComparer<TimeOnly>(new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<TimeOnly?>(new JsonCollectionOfNullableStructsReaderWriter<TimeOnly?[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<TimeOnly?[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance),
+                elementMapping: JetTimeOnlyTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v),
+                    keyComparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v),
+                    providerValueComparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v)));
+            var nullableTimeOnlyArrayElementType = nullableTimeOnlyArray.SetElementType(typeof(TimeOnly?),
+                nullable: true);
+            nullableTimeOnlyArrayElementType.TypeMapping = nullableTimeOnlyArray.TypeMapping.ElementTypeMapping;
+            nullableTimeOnlyArrayElementType.SetComparer(new NullableValueComparer<TimeOnly>(nullableTimeOnlyArrayElementType.TypeMapping.Comparer));
+
+            var nullableTimeSpan = runtimeEntityType.AddProperty(
+                "NullableTimeSpan",
+                typeof(TimeSpan?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeSpan", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeSpan>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableTimeSpan.SetGetter(
+                TimeSpan? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeSpan(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableTimeSpan(instance).HasValue));
+            nullableTimeSpan.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeSpan(instance) = value;
+                    return instance;
+                });
+            nullableTimeSpan.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeSpan(instance) = value;
+                    return instance;
+                });
+            nullableTimeSpan.SetAccessors(
+                TimeSpan? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeSpan(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeSpan(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan? (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan?>(nullableTimeSpan, 188),
+                TimeSpan? (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan?>(nullableTimeSpan));
+            nullableTimeSpan.SetPropertyIndexes(
+                index: 188,
+                originalValueIndex: 188,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableTimeSpan.TypeMapping = JetTimeSpanTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v));
+            nullableTimeSpan.SetComparer(new NullableValueComparer<TimeSpan>(nullableTimeSpan.TypeMapping.Comparer));
+            nullableTimeSpan.SetKeyComparer(new NullableValueComparer<TimeSpan>(nullableTimeSpan.TypeMapping.KeyComparer));
+
+            var nullableTimeSpanArray = runtimeEntityType.AddProperty(
+                "NullableTimeSpanArray",
+                typeof(TimeSpan?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeSpanArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeSpanArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableTimeSpanArray.SetGetter(
+                TimeSpan? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeSpanArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeSpanArray(instance) == null);
+            nullableTimeSpanArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeSpanArray(instance) = value;
+                    return instance;
+                });
+            nullableTimeSpanArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeSpanArray(instance) = value;
+                    return instance;
+                });
+            nullableTimeSpanArray.SetAccessors(
+                TimeSpan? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeSpanArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeSpanArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan? [] (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan? []>(nullableTimeSpanArray, 189),
+                TimeSpan? [] (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan? []>(nullableTimeSpanArray));
+            nullableTimeSpanArray.SetPropertyIndexes(
+                index: 189,
+                originalValueIndex: 189,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableTimeSpanArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<TimeSpan?[], TimeSpan>(new NullableValueComparer<TimeSpan>(new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<TimeSpan?[], TimeSpan>(new NullableValueComparer<TimeSpan>(new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<TimeSpan?>(new JsonCollectionOfNullableStructsReaderWriter<TimeSpan?[], TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<TimeSpan?[], TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance),
+                elementMapping: JetTimeSpanTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v),
+                    keyComparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v),
+                    providerValueComparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v)));
+            var nullableTimeSpanArrayElementType = nullableTimeSpanArray.SetElementType(typeof(TimeSpan?),
+                nullable: true);
+            nullableTimeSpanArrayElementType.TypeMapping = nullableTimeSpanArray.TypeMapping.ElementTypeMapping;
+            nullableTimeSpanArrayElementType.SetComparer(new NullableValueComparer<TimeSpan>(nullableTimeSpanArrayElementType.TypeMapping.Comparer));
+
+            var nullableUInt16 = runtimeEntityType.AddProperty(
+                "NullableUInt16",
+                typeof(ushort?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt16.SetGetter(
+                ushort? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableUInt16(instance).HasValue));
+            nullableUInt16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt16(instance) = value;
+                    return instance;
+                });
+            nullableUInt16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt16(instance) = value;
+                    return instance;
+                });
+            nullableUInt16.SetAccessors(
+                ushort? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort? (IInternalEntry entry) => entry.ReadOriginalValue<ushort?>(nullableUInt16, 190),
+                ushort? (IInternalEntry entry) => entry.GetCurrentValue<ushort?>(nullableUInt16));
+            nullableUInt16.SetPropertyIndexes(
+                index: 190,
+                originalValueIndex: 190,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt16.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v),
+                keyComparer: new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<ushort, int>(
+                    int (ushort v) => ((int)v),
+                    ushort (int v) => ((ushort)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ushort, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<ushort, int>(
+                        int (ushort v) => ((int)v),
+                        ushort (int v) => ((ushort)v))));
+            nullableUInt16.SetComparer(new NullableValueComparer<ushort>(nullableUInt16.TypeMapping.Comparer));
+            nullableUInt16.SetKeyComparer(new NullableValueComparer<ushort>(nullableUInt16.TypeMapping.KeyComparer));
+
+            var nullableUInt16Array = runtimeEntityType.AddProperty(
+                "NullableUInt16Array",
+                typeof(ushort?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt16Array.SetGetter(
+                ushort? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt16Array(instance) == null);
+            nullableUInt16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt16Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt16Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt16Array.SetAccessors(
+                ushort? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort? [] (IInternalEntry entry) => entry.ReadOriginalValue<ushort? []>(nullableUInt16Array, 191),
+                ushort? [] (IInternalEntry entry) => entry.GetCurrentValue<ushort? []>(nullableUInt16Array));
+            nullableUInt16Array.SetPropertyIndexes(
+                index: 191,
+                originalValueIndex: 191,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<ushort?[], ushort>(new NullableValueComparer<ushort>(new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<ushort?[], ushort>(new NullableValueComparer<ushort>(new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<ushort?>(new JsonCollectionOfNullableStructsReaderWriter<ushort?[], ushort>(
+                    new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<ushort?[], ushort>(
+                    new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ushort>(
+                        bool (ushort v1, ushort v2) => v1 == v2,
+                        int (ushort v) => ((int)v),
+                        ushort (ushort v) => v),
+                    keyComparer: new ValueComparer<ushort>(
+                        bool (ushort v1, ushort v2) => v1 == v2,
+                        int (ushort v) => ((int)v),
+                        ushort (ushort v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<ushort, int>(
+                        int (ushort v) => ((int)v),
+                        ushort (int v) => ((ushort)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v)))));
+            var nullableUInt16ArrayElementType = nullableUInt16Array.SetElementType(typeof(ushort?),
+                nullable: true);
+            nullableUInt16ArrayElementType.TypeMapping = nullableUInt16Array.TypeMapping.ElementTypeMapping;
+            nullableUInt16ArrayElementType.SetComparer(new NullableValueComparer<ushort>(nullableUInt16ArrayElementType.TypeMapping.Comparer));
+
+            var nullableUInt32 = runtimeEntityType.AddProperty(
+                "NullableUInt32",
+                typeof(uint?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt32.SetGetter(
+                uint? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableUInt32(instance).HasValue));
+            nullableUInt32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt32(instance) = value;
+                    return instance;
+                });
+            nullableUInt32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt32(instance) = value;
+                    return instance;
+                });
+            nullableUInt32.SetAccessors(
+                uint? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint? (IInternalEntry entry) => entry.ReadOriginalValue<uint?>(nullableUInt32, 192),
+                uint? (IInternalEntry entry) => entry.GetCurrentValue<uint?>(nullableUInt32));
+            nullableUInt32.SetPropertyIndexes(
+                index: 192,
+                originalValueIndex: 192,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt32.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v),
+                keyComparer: new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<uint, long>(
+                    long (uint v) => ((long)v),
+                    uint (long v) => ((uint)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<uint, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<uint, long>(
+                        long (uint v) => ((long)v),
+                        uint (long v) => ((uint)v))));
+            nullableUInt32.SetComparer(new NullableValueComparer<uint>(nullableUInt32.TypeMapping.Comparer));
+            nullableUInt32.SetKeyComparer(new NullableValueComparer<uint>(nullableUInt32.TypeMapping.KeyComparer));
+
+            var nullableUInt32Array = runtimeEntityType.AddProperty(
+                "NullableUInt32Array",
+                typeof(uint?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt32Array.SetGetter(
+                uint? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt32Array(instance) == null);
+            nullableUInt32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt32Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt32Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt32Array.SetAccessors(
+                uint? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint? [] (IInternalEntry entry) => entry.ReadOriginalValue<uint? []>(nullableUInt32Array, 193),
+                uint? [] (IInternalEntry entry) => entry.GetCurrentValue<uint? []>(nullableUInt32Array));
+            nullableUInt32Array.SetPropertyIndexes(
+                index: 193,
+                originalValueIndex: 193,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<uint?[], uint>(new NullableValueComparer<uint>(new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<uint?[], uint>(new NullableValueComparer<uint>(new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<uint?>(new JsonCollectionOfNullableStructsReaderWriter<uint?[], uint>(
+                    new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<uint?[], uint>(
+                    new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<uint>(
+                        bool (uint v1, uint v2) => v1 == v2,
+                        int (uint v) => ((int)v),
+                        uint (uint v) => v),
+                    keyComparer: new ValueComparer<uint>(
+                        bool (uint v1, uint v2) => v1 == v2,
+                        int (uint v) => ((int)v),
+                        uint (uint v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<uint, long>(
+                        long (uint v) => ((long)v),
+                        uint (long v) => ((uint)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v)))));
+            var nullableUInt32ArrayElementType = nullableUInt32Array.SetElementType(typeof(uint?),
+                nullable: true);
+            nullableUInt32ArrayElementType.TypeMapping = nullableUInt32Array.TypeMapping.ElementTypeMapping;
+            nullableUInt32ArrayElementType.SetComparer(new NullableValueComparer<uint>(nullableUInt32ArrayElementType.TypeMapping.Comparer));
+
+            var nullableUInt64 = runtimeEntityType.AddProperty(
+                "NullableUInt64",
+                typeof(ulong?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt64.SetGetter(
+                ulong? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableUInt64(instance).HasValue));
+            nullableUInt64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt64(instance) = value;
+                    return instance;
+                });
+            nullableUInt64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt64(instance) = value;
+                    return instance;
+                });
+            nullableUInt64.SetAccessors(
+                ulong? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong? (IInternalEntry entry) => entry.ReadOriginalValue<ulong?>(nullableUInt64, 194),
+                ulong? (IInternalEntry entry) => entry.GetCurrentValue<ulong?>(nullableUInt64));
+            nullableUInt64.SetPropertyIndexes(
+                index: 194,
+                originalValueIndex: 194,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt64.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v),
+                keyComparer: new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<ulong, decimal>(
+                    decimal (ulong v) => ((decimal)v),
+                    ulong (decimal v) => ((ulong)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ulong, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<ulong, decimal>(
+                        decimal (ulong v) => ((decimal)v),
+                        ulong (decimal v) => ((ulong)v))));
+            nullableUInt64.SetComparer(new NullableValueComparer<ulong>(nullableUInt64.TypeMapping.Comparer));
+            nullableUInt64.SetKeyComparer(new NullableValueComparer<ulong>(nullableUInt64.TypeMapping.KeyComparer));
+
+            var nullableUInt64Array = runtimeEntityType.AddProperty(
+                "NullableUInt64Array",
+                typeof(ulong?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt64Array.SetGetter(
+                ulong? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt64Array(instance) == null);
+            nullableUInt64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt64Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt64Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt64Array.SetAccessors(
+                ulong? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong? [] (IInternalEntry entry) => entry.ReadOriginalValue<ulong? []>(nullableUInt64Array, 195),
+                ulong? [] (IInternalEntry entry) => entry.GetCurrentValue<ulong? []>(nullableUInt64Array));
+            nullableUInt64Array.SetPropertyIndexes(
+                index: 195,
+                originalValueIndex: 195,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<ulong?[], ulong>(new NullableValueComparer<ulong>(new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<ulong?[], ulong>(new NullableValueComparer<ulong>(new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<ulong?>(new JsonCollectionOfNullableStructsReaderWriter<ulong?[], ulong>(
+                    new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<ulong?[], ulong>(
+                    new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v)))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ulong>(
+                        bool (ulong v1, ulong v2) => v1 == v2,
+                        int (ulong v) => ((object)v).GetHashCode(),
+                        ulong (ulong v) => v),
+                    keyComparer: new ValueComparer<ulong>(
+                        bool (ulong v1, ulong v2) => v1 == v2,
+                        int (ulong v) => ((object)v).GetHashCode(),
+                        ulong (ulong v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<ulong, decimal>(
+                        decimal (ulong v) => ((decimal)v),
+                        ulong (decimal v) => ((ulong)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v)))));
+            var nullableUInt64ArrayElementType = nullableUInt64Array.SetElementType(typeof(ulong?),
+                nullable: true);
+            nullableUInt64ArrayElementType.TypeMapping = nullableUInt64Array.TypeMapping.ElementTypeMapping;
+            nullableUInt64ArrayElementType.SetComparer(new NullableValueComparer<ulong>(nullableUInt64ArrayElementType.TypeMapping.Comparer));
+
+            var nullableUInt8 = runtimeEntityType.AddProperty(
+                "NullableUInt8",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt8.SetGetter(
+                byte? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableUInt8(instance).HasValue));
+            nullableUInt8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt8(instance) = value;
+                    return instance;
+                });
+            nullableUInt8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt8(instance) = value;
+                    return instance;
+                });
+            nullableUInt8.SetAccessors(
+                byte? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte? (IInternalEntry entry) => entry.ReadOriginalValue<byte?>(nullableUInt8, 196),
+                byte? (IInternalEntry entry) => entry.GetCurrentValue<byte?>(nullableUInt8));
+            nullableUInt8.SetPropertyIndexes(
+                index: 196,
+                originalValueIndex: 196,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt8.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                keyComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v));
+            nullableUInt8.SetComparer(new NullableValueComparer<byte>(nullableUInt8.TypeMapping.Comparer));
+            nullableUInt8.SetKeyComparer(new NullableValueComparer<byte>(nullableUInt8.TypeMapping.KeyComparer));
+
+            var nullableUInt8Array = runtimeEntityType.AddProperty(
+                "NullableUInt8Array",
+                typeof(byte?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt8Array.SetGetter(
+                byte? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt8Array(instance) == null);
+            nullableUInt8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt8Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt8Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt8Array.SetAccessors(
+                byte? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte? [] (IInternalEntry entry) => entry.ReadOriginalValue<byte? []>(nullableUInt8Array, 197),
+                byte? [] (IInternalEntry entry) => entry.GetCurrentValue<byte? []>(nullableUInt8Array));
+            nullableUInt8Array.SetPropertyIndexes(
+                index: 197,
+                originalValueIndex: 197,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<byte?[], byte>(new NullableValueComparer<byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<byte?[], byte>(new NullableValueComparer<byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte?>(new JsonCollectionOfNullableStructsReaderWriter<byte?[], byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<byte?[], byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var nullableUInt8ArrayElementType = nullableUInt8Array.SetElementType(typeof(byte?),
+                nullable: true);
+            nullableUInt8ArrayElementType.TypeMapping = nullableUInt8Array.TypeMapping.ElementTypeMapping;
+            nullableUInt8ArrayElementType.SetComparer(new NullableValueComparer<byte>(nullableUInt8ArrayElementType.TypeMapping.Comparer));
+
+            var nullableUri = runtimeEntityType.AddProperty(
+                "NullableUri",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUri", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUri>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUri.SetGetter(
+                Uri (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUri(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUri(instance) == null);
+            nullableUri.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUri(instance) = value;
+                    return instance;
+                });
+            nullableUri.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUri(instance) = value;
+                    return instance;
+                });
+            nullableUri.SetAccessors(
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUri(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUri(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => entry.ReadOriginalValue<Uri>(nullableUri, 198),
+                Uri (IInternalEntry entry) => entry.GetCurrentValue<Uri>(nullableUri));
+            nullableUri.SetPropertyIndexes(
+                index: 198,
+                originalValueIndex: 198,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUri.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                keyComparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<Uri, string>(
+                    string (Uri v) => ((object)v).ToString(),
+                    Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))));
+
+            var nullableUriArray = runtimeEntityType.AddProperty(
+                "NullableUriArray",
+                typeof(Uri[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUriArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUriArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUriArray.SetGetter(
+                Uri[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUriArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUriArray(instance) == null);
+            nullableUriArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUriArray(instance) = value;
+                    return instance;
+                });
+            nullableUriArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUriArray(instance) = value;
+                    return instance;
+                });
+            nullableUriArray.SetAccessors(
+                Uri[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUriArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUriArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri[] (IInternalEntry entry) => entry.ReadOriginalValue<Uri[]>(nullableUriArray, 199),
+                Uri[] (IInternalEntry entry) => entry.GetCurrentValue<Uri[]>(nullableUriArray));
+            nullableUriArray.SetPropertyIndexes(
+                index: 199,
+                originalValueIndex: 199,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUriArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<Uri[], Uri>(new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<Uri[], Uri>(new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<Uri>(new JsonCollectionOfReferencesReaderWriter<Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Uri>(
+                        bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (Uri v) => ((object)v).GetHashCode(),
+                        Uri (Uri v) => v),
+                    keyComparer: new ValueComparer<Uri>(
+                        bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (Uri v) => ((object)v).GetHashCode(),
+                        Uri (Uri v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))));
+            var nullableUriArrayElementType = nullableUriArray.SetElementType(typeof(Uri),
+                nullable: true);
+            nullableUriArrayElementType.TypeMapping = nullableUriArray.TypeMapping.ElementTypeMapping;
+
+            var physicalAddress = runtimeEntityType.AddProperty(
+                "PhysicalAddress",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            physicalAddress.SetGetter(
+                PhysicalAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddress(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddress(instance) == null);
+            physicalAddress.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddress(instance) = value;
+                    return instance;
+                });
+            physicalAddress.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddress(instance) = value;
+                    return instance;
+                });
+            physicalAddress.SetAccessors(
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress>(physicalAddress, 200),
+                PhysicalAddress (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress>(physicalAddress));
+            physicalAddress.SetPropertyIndexes(
+                index: 200,
+                originalValueIndex: 200,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            physicalAddress.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(20)",
+                    size: 20),
+                converter: new ValueConverter<PhysicalAddress, string>(
+                    string (PhysicalAddress v) => ((object)v).ToString(),
+                    PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v))));
+
+            var physicalAddressArray = runtimeEntityType.AddProperty(
+                "PhysicalAddressArray",
+                typeof(PhysicalAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            physicalAddressArray.SetGetter(
+                PhysicalAddress[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressArray(instance) == null);
+            physicalAddressArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressArray(instance) = value;
+                    return instance;
+                });
+            physicalAddressArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressArray(instance) = value;
+                    return instance;
+                });
+            physicalAddressArray.SetAccessors(
+                PhysicalAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress[]>(physicalAddressArray, 201),
+                PhysicalAddress[] (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress[]>(physicalAddressArray));
+            physicalAddressArray.SetPropertyIndexes(
+                index: 201,
+                originalValueIndex: 201,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            physicalAddressArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<PhysicalAddress[], PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<PhysicalAddress[], PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<PhysicalAddress>(new JsonCollectionOfReferencesReaderWriter<PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<PhysicalAddress>(
+                        bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                        PhysicalAddress (PhysicalAddress v) => v),
+                    keyComparer: new ValueComparer<PhysicalAddress>(
+                        bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                        PhysicalAddress (PhysicalAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(20)",
+                        size: 20),
+                    converter: new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v)))));
+            var physicalAddressArrayElementType = physicalAddressArray.SetElementType(typeof(PhysicalAddress));
+            physicalAddressArrayElementType.TypeMapping = physicalAddressArray.TypeMapping.ElementTypeMapping;
+
+            var physicalAddressToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "PhysicalAddressToBytesConverterProperty",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new PhysicalAddressToBytesConverter());
+            physicalAddressToBytesConverterProperty.SetGetter(
+                PhysicalAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(instance) == null);
+            physicalAddressToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            physicalAddressToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            physicalAddressToBytesConverterProperty.SetAccessors(
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress>(physicalAddressToBytesConverterProperty, 202),
+                PhysicalAddress (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress>(physicalAddressToBytesConverterProperty));
+            physicalAddressToBytesConverterProperty.SetPropertyIndexes(
+                index: 202,
+                originalValueIndex: 202,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            physicalAddressToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(8)",
+                    size: 8),
+                converter: new ValueConverter<PhysicalAddress, byte[]>(
+                    byte[] (PhysicalAddress v) => v.GetAddressBytes(),
+                    PhysicalAddress (byte[] v) => new PhysicalAddress(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, byte[]>(
+                        byte[] (PhysicalAddress v) => v.GetAddressBytes(),
+                        PhysicalAddress (byte[] v) => new PhysicalAddress(v))));
+
+            var physicalAddressToStringConverterProperty = runtimeEntityType.AddProperty(
+                "PhysicalAddressToStringConverterProperty",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new PhysicalAddressToStringConverter());
+            physicalAddressToStringConverterProperty.SetGetter(
+                PhysicalAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(instance) == null);
+            physicalAddressToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            physicalAddressToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            physicalAddressToStringConverterProperty.SetAccessors(
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress>(physicalAddressToStringConverterProperty, 203),
+                PhysicalAddress (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress>(physicalAddressToStringConverterProperty));
+            physicalAddressToStringConverterProperty.SetPropertyIndexes(
+                index: 203,
+                originalValueIndex: 203,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            physicalAddressToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(20)",
+                    size: 20),
+                converter: new ValueConverter<PhysicalAddress, string>(
+                    string (PhysicalAddress v) => ((object)v).ToString(),
+                    PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v))));
+
+            var @string = runtimeEntityType.AddProperty(
+                "String",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("String", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<String>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            @string.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.String(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.String(instance) == null);
+            @string.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.String(instance) = value;
+                    return instance;
+                });
+            @string.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.String(instance) = value;
+                    return instance;
+                });
+            @string.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.String(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.String(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(@string, 204),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(@string));
+            @string.SetPropertyIndexes(
+                index: 204,
+                originalValueIndex: 204,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @string.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var stringArray = runtimeEntityType.AddProperty(
+                "StringArray",
+                typeof(string[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            stringArray.SetGetter(
+                string[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringArray(instance) == null);
+            stringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringArray(instance) = value;
+                    return instance;
+                });
+            stringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringArray(instance) = value;
+                    return instance;
+                });
+            stringArray.SetAccessors(
+                string[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string[] (IInternalEntry entry) => entry.ReadOriginalValue<string[]>(stringArray, 205),
+                string[] (IInternalEntry entry) => entry.GetCurrentValue<string[]>(stringArray));
+            stringArray.SetPropertyIndexes(
+                index: 205,
+                originalValueIndex: 205,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<string[], string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<string[], string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var stringArrayElementType = stringArray.SetElementType(typeof(string));
+            stringArrayElementType.TypeMapping = stringArray.TypeMapping.ElementTypeMapping;
+
+            var stringReadOnlyCollection = runtimeEntityType.AddProperty(
+                "StringReadOnlyCollection",
+                typeof(IReadOnlyCollection<string>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_stringReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            stringReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<string> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<string>)(ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance) == null);
+            stringReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<string> value) =>
+                {
+                    ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance) = ((List<string>)value);
+                    return instance;
+                });
+            stringReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<string> value) =>
+                {
+                    ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance) = ((List<string>)value);
+                    return instance;
+                });
+            stringReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<string> (IInternalEntry entry) => ((IReadOnlyCollection<string>)(ManyTypesUnsafeAccessors._stringReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<string> (IInternalEntry entry) => ((IReadOnlyCollection<string>)(ManyTypesUnsafeAccessors._stringReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<string> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<string>>(stringReadOnlyCollection, 206),
+                IReadOnlyCollection<string> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<string>>(stringReadOnlyCollection));
+            stringReadOnlyCollection.SetPropertyIndexes(
+                index: 206,
+                originalValueIndex: 206,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var stringReadOnlyCollectionElementType = stringReadOnlyCollection.SetElementType(typeof(string));
+            stringReadOnlyCollectionElementType.TypeMapping = stringReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var stringToBoolConverterProperty = runtimeEntityType.AddProperty(
+                "StringToBoolConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToBoolConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToBoolConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToBoolConverter());
+            stringToBoolConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToBoolConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToBoolConverterProperty(instance) == null);
+            stringToBoolConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToBoolConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToBoolConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToBoolConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToBoolConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToBoolConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToBoolConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToBoolConverterProperty, 207),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToBoolConverterProperty));
+            stringToBoolConverterProperty.SetPropertyIndexes(
+                index: 207,
+                originalValueIndex: 207,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToBoolConverterProperty.TypeMapping = JetBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                converter: new ValueConverter<string, bool>(
+                    bool (string v) => Convert.ToBoolean(v),
+                    string (bool v) => Convert.ToString(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, bool>(
+                    JsonBoolReaderWriter.Instance,
+                    new ValueConverter<string, bool>(
+                        bool (string v) => Convert.ToBoolean(v),
+                        string (bool v) => Convert.ToString(v))));
+
+            var stringToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "StringToBytesConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            stringToBytesConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToBytesConverterProperty(instance) == null);
+            stringToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToBytesConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToBytesConverterProperty, 208),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToBytesConverterProperty));
+            stringToBytesConverterProperty.SetPropertyIndexes(
+                index: 208,
+                originalValueIndex: 208,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                converter: new ValueConverter<string, byte[]>(
+                    byte[] (string v) => Encoding.GetEncoding(12000).GetBytes(v),
+                    string (byte[] v) => Encoding.GetEncoding(12000).GetString(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<string, byte[]>(
+                        byte[] (string v) => Encoding.GetEncoding(12000).GetBytes(v),
+                        string (byte[] v) => Encoding.GetEncoding(12000).GetString(v))));
+
+            var stringToCharConverterProperty = runtimeEntityType.AddProperty(
+                "StringToCharConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToCharConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToCharConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToCharConverter());
+            stringToCharConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToCharConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToCharConverterProperty(instance) == null);
+            stringToCharConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToCharConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToCharConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToCharConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToCharConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToCharConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToCharConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToCharConverterProperty, 209),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToCharConverterProperty));
+            stringToCharConverterProperty.SetPropertyIndexes(
+                index: 209,
+                originalValueIndex: 209,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToCharConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<string, string>(
+                    string (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)((v.Length < 1 ? '\0' : v[0])))),
+                    string (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)((v.Length < 1 ? '\0' : v[0]))))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        string (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)((v.Length < 1 ? '\0' : v[0])))),
+                        string (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)((v.Length < 1 ? '\0' : v[0])))))));
+
+            var stringToDateOnlyConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateOnlyConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateOnlyConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateOnlyConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateOnlyConverter());
+            stringToDateOnlyConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(instance) == null);
+            stringToDateOnlyConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateOnlyConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateOnlyConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDateOnlyConverterProperty, 210),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDateOnlyConverterProperty));
+            stringToDateOnlyConverterProperty.SetPropertyIndexes(
+                index: 210,
+                originalValueIndex: 210,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDateOnlyConverterProperty.TypeMapping = JetDateOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 10),
+                converter: new ValueConverter<string, DateOnly>(
+                    DateOnly (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                    string (DateOnly v) => v.ToString("yyyy\\-MM\\-dd")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance,
+                    new ValueConverter<string, DateOnly>(
+                        DateOnly (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                        string (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"))));
+
+            var stringToDateTimeConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateTimeConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateTimeConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateTimeConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateTimeConverter());
+            stringToDateTimeConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(instance) == null);
+            stringToDateTimeConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateTimeConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateTimeConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDateTimeConverterProperty, 211),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDateTimeConverterProperty));
+            stringToDateTimeConverterProperty.SetPropertyIndexes(
+                index: 211,
+                originalValueIndex: 211,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDateTimeConverterProperty.TypeMapping = JetDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 48),
+                converter: new ValueConverter<string, DateTime>(
+                    DateTime (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture),
+                    string (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, DateTime>(
+                    JsonDateTimeReaderWriter.Instance,
+                    new ValueConverter<string, DateTime>(
+                        DateTime (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture),
+                        string (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"))));
+
+            var stringToDateTimeOffsetConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateTimeOffsetConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateTimeOffsetConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateTimeOffsetConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateTimeOffsetConverter());
+            stringToDateTimeOffsetConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(instance) == null);
+            stringToDateTimeOffsetConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateTimeOffsetConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateTimeOffsetConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDateTimeOffsetConverterProperty, 212),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDateTimeOffsetConverterProperty));
+            stringToDateTimeOffsetConverterProperty.SetPropertyIndexes(
+                index: 212,
+                originalValueIndex: 212,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDateTimeOffsetConverterProperty.TypeMapping = JetDateTimeOffsetTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 48),
+                converter: new ValueConverter<string, DateTimeOffset>(
+                    DateTimeOffset (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture),
+                    string (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, DateTimeOffset>(
+                    JsonDateTimeOffsetReaderWriter.Instance,
+                    new ValueConverter<string, DateTimeOffset>(
+                        DateTimeOffset (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture),
+                        string (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"))));
+
+            var stringToDecimalNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDecimalNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDecimalNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDecimalNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<decimal>());
+            stringToDecimalNumberConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(instance) == null);
+            stringToDecimalNumberConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDecimalNumberConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDecimalNumberConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDecimalNumberConverterProperty, 213),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDecimalNumberConverterProperty));
+            stringToDecimalNumberConverterProperty.SetPropertyIndexes(
+                index: 213,
+                originalValueIndex: 213,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDecimalNumberConverterProperty.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 64),
+                converter: new ValueConverter<string, decimal>(
+                    decimal (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                    string (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<string, decimal>(
+                        decimal (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                        string (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)))));
+
+            var stringToDoubleNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDoubleNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDoubleNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDoubleNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<double>());
+            stringToDoubleNumberConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(instance) == null);
+            stringToDoubleNumberConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDoubleNumberConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDoubleNumberConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDoubleNumberConverterProperty, 214),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDoubleNumberConverterProperty));
+            stringToDoubleNumberConverterProperty.SetPropertyIndexes(
+                index: 214,
+                originalValueIndex: 214,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDoubleNumberConverterProperty.TypeMapping = JetDoubleTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 64),
+                converter: new ValueConverter<string, double>(
+                    double (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                    string (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", ((object)v))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, double>(
+                    JsonDoubleReaderWriter.Instance,
+                    new ValueConverter<string, double>(
+                        double (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                        string (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", ((object)v)))));
+
+            var stringToEnumConverterProperty = runtimeEntityType.AddProperty(
+                "StringToEnumConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToEnumConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToEnumConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToEnumConverter<CompiledModelTestBase.EnumU32>());
+            stringToEnumConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToEnumConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToEnumConverterProperty(instance) == null);
+            stringToEnumConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToEnumConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToEnumConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToEnumConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToEnumConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToEnumConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToEnumConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToEnumConverterProperty, 215),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToEnumConverterProperty));
+            stringToEnumConverterProperty.SetPropertyIndexes(
+                index: 215,
+                originalValueIndex: 215,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToEnumConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<string, long>(
+                    long (string v) => ((long)(StringEnumConverter<string, CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))),
+                    string (long value) => ((object)((CompiledModelTestBase.EnumU32)value)).ToString()),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<string, long>(
+                        long (string v) => ((long)(StringEnumConverter<string, CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))),
+                        string (long value) => ((object)((CompiledModelTestBase.EnumU32)value)).ToString())));
+
+            var stringToGuidConverterProperty = runtimeEntityType.AddProperty(
+                "StringToGuidConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToGuidConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToGuidConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            stringToGuidConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToGuidConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToGuidConverterProperty(instance) == null);
+            stringToGuidConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToGuidConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToGuidConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToGuidConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToGuidConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToGuidConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToGuidConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToGuidConverterProperty, 216),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToGuidConverterProperty));
+            stringToGuidConverterProperty.SetPropertyIndexes(
+                index: 216,
+                originalValueIndex: 216,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToGuidConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var stringToIntNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToIntNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToIntNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToIntNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<int>());
+            stringToIntNumberConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(instance) == null);
+            stringToIntNumberConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToIntNumberConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToIntNumberConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToIntNumberConverterProperty, 217),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToIntNumberConverterProperty));
+            stringToIntNumberConverterProperty.SetPropertyIndexes(
+                index: 217,
+                originalValueIndex: 217,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToIntNumberConverterProperty.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 64),
+                converter: new ValueConverter<string, int>(
+                    int (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                    string (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<string, int>(
+                        int (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                        string (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)))));
+
+            var stringToTimeOnlyConverterProperty = runtimeEntityType.AddProperty(
+                "StringToTimeOnlyConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToTimeOnlyConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToTimeOnlyConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToTimeOnlyConverter());
+            stringToTimeOnlyConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(instance) == null);
+            stringToTimeOnlyConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToTimeOnlyConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToTimeOnlyConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToTimeOnlyConverterProperty, 218),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToTimeOnlyConverterProperty));
+            stringToTimeOnlyConverterProperty.SetPropertyIndexes(
+                index: 218,
+                originalValueIndex: 218,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToTimeOnlyConverterProperty.TypeMapping = JetTimeOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 48),
+                converter: new ValueConverter<string, TimeOnly>(
+                    TimeOnly (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                    string (TimeOnly v) => (v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", ((object)v)) : v.ToString("o"))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance,
+                    new ValueConverter<string, TimeOnly>(
+                        TimeOnly (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                        string (TimeOnly v) => (v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", ((object)v)) : v.ToString("o")))));
+
+            var stringToTimeSpanConverterProperty = runtimeEntityType.AddProperty(
+                "StringToTimeSpanConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToTimeSpanConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToTimeSpanConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToTimeSpanConverter());
+            stringToTimeSpanConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(instance) == null);
+            stringToTimeSpanConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToTimeSpanConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToTimeSpanConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToTimeSpanConverterProperty, 219),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToTimeSpanConverterProperty));
+            stringToTimeSpanConverterProperty.SetPropertyIndexes(
+                index: 219,
+                originalValueIndex: 219,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToTimeSpanConverterProperty.TypeMapping = JetTimeSpanTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 48),
+                converter: new ValueConverter<string, TimeSpan>(
+                    TimeSpan (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture),
+                    string (TimeSpan v) => v.ToString("c")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance,
+                    new ValueConverter<string, TimeSpan>(
+                        TimeSpan (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture),
+                        string (TimeSpan v) => v.ToString("c"))));
+
+            var stringToUriConverterProperty = runtimeEntityType.AddProperty(
+                "StringToUriConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToUriConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToUriConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToUriConverter());
+            stringToUriConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToUriConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToUriConverterProperty(instance) == null);
+            stringToUriConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToUriConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToUriConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToUriConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToUriConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToUriConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToUriConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToUriConverterProperty, 220),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToUriConverterProperty));
+            stringToUriConverterProperty.SetPropertyIndexes(
+                index: 220,
+                originalValueIndex: 220,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToUriConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<string, string>(
+                    string (string v) => ((object)new Uri(v, UriKind.RelativeOrAbsolute)).ToString(),
+                    string (string v) => ((object)new Uri(v, UriKind.RelativeOrAbsolute)).ToString()),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        string (string v) => ((object)new Uri(v, UriKind.RelativeOrAbsolute)).ToString(),
+                        string (string v) => ((object)new Uri(v, UriKind.RelativeOrAbsolute)).ToString())));
+
+            var timeOnly = runtimeEntityType.AddProperty(
+                "TimeOnly",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new TimeOnly(0, 0, 0));
+            timeOnly.SetGetter(
+                TimeOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnly(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnly(instance) == default(TimeOnly));
+            timeOnly.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnly(instance) = value;
+                    return instance;
+                });
+            timeOnly.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnly(instance) = value;
+                    return instance;
+                });
+            timeOnly.SetAccessors(
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly>(timeOnly, 221),
+                TimeOnly (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly>(timeOnly));
+            timeOnly.SetPropertyIndexes(
+                index: 221,
+                originalValueIndex: 221,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeOnly.TypeMapping = JetTimeOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v));
+
+            var timeOnlyArray = runtimeEntityType.AddProperty(
+                "TimeOnlyArray",
+                typeof(TimeOnly[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            timeOnlyArray.SetGetter(
+                TimeOnly[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyArray(instance) == null);
+            timeOnlyArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyArray(instance) = value;
+                    return instance;
+                });
+            timeOnlyArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyArray(instance) = value;
+                    return instance;
+                });
+            timeOnlyArray.SetAccessors(
+                TimeOnly[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly[] (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly[]>(timeOnlyArray, 222),
+                TimeOnly[] (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly[]>(timeOnlyArray));
+            timeOnlyArray.SetPropertyIndexes(
+                index: 222,
+                originalValueIndex: 222,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeOnlyArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<TimeOnly[], TimeOnly>(new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v)),
+                keyComparer: new ListOfValueTypesComparer<TimeOnly[], TimeOnly>(new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<TimeOnly>(new JsonCollectionOfStructsReaderWriter<TimeOnly[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<TimeOnly[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance),
+                elementMapping: JetTimeOnlyTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v),
+                    keyComparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v),
+                    providerValueComparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v)));
+            var timeOnlyArrayElementType = timeOnlyArray.SetElementType(typeof(TimeOnly));
+            timeOnlyArrayElementType.TypeMapping = timeOnlyArray.TypeMapping.ElementTypeMapping;
+
+            var timeOnlyToStringConverterProperty = runtimeEntityType.AddProperty(
+                "TimeOnlyToStringConverterProperty",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeOnlyToStringConverter());
+            timeOnlyToStringConverterProperty.SetGetter(
+                TimeOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(instance) == default(TimeOnly));
+            timeOnlyToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeOnlyToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeOnlyToStringConverterProperty.SetAccessors(
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly>(timeOnlyToStringConverterProperty, 223),
+                TimeOnly (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly>(timeOnlyToStringConverterProperty));
+            timeOnlyToStringConverterProperty.SetPropertyIndexes(
+                index: 223,
+                originalValueIndex: 223,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeOnlyToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<TimeOnly, string>(
+                    string (TimeOnly v) => (v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", ((object)v)) : v.ToString("o")),
+                    TimeOnly (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeOnly, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<TimeOnly, string>(
+                        string (TimeOnly v) => (v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", ((object)v)) : v.ToString("o")),
+                        TimeOnly (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None))));
+            timeOnlyToStringConverterProperty.SetSentinelFromProviderValue("00:00:00");
+
+            var timeOnlyToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "TimeOnlyToTicksConverterProperty",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeOnlyToTicksConverter());
+            timeOnlyToTicksConverterProperty.SetGetter(
+                TimeOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(instance) == default(TimeOnly));
+            timeOnlyToTicksConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeOnlyToTicksConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeOnlyToTicksConverterProperty.SetAccessors(
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly>(timeOnlyToTicksConverterProperty, 224),
+                TimeOnly (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly>(timeOnlyToTicksConverterProperty));
+            timeOnlyToTicksConverterProperty.SetPropertyIndexes(
+                index: 224,
+                originalValueIndex: 224,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeOnlyToTicksConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<TimeOnly, long>(
+                    long (TimeOnly v) => v.Ticks,
+                    TimeOnly (long v) => new TimeOnly(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeOnly, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<TimeOnly, long>(
+                        long (TimeOnly v) => v.Ticks,
+                        TimeOnly (long v) => new TimeOnly(v))));
+            timeOnlyToTicksConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var timeSpan = runtimeEntityType.AddProperty(
+                "TimeSpan",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpan", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpan>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new TimeSpan(0, 0, 0, 0, 0));
+            timeSpan.SetGetter(
+                TimeSpan (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpan(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpan(instance) == default(TimeSpan));
+            timeSpan.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpan(instance) = value;
+                    return instance;
+                });
+            timeSpan.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpan(instance) = value;
+                    return instance;
+                });
+            timeSpan.SetAccessors(
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpan(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpan(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan>(timeSpan, 225),
+                TimeSpan (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan>(timeSpan));
+            timeSpan.SetPropertyIndexes(
+                index: 225,
+                originalValueIndex: 225,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeSpan.TypeMapping = JetTimeSpanTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v));
+
+            var timeSpanArray = runtimeEntityType.AddProperty(
+                "TimeSpanArray",
+                typeof(TimeSpan[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            timeSpanArray.SetGetter(
+                TimeSpan[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanArray(instance) == null);
+            timeSpanArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanArray(instance) = value;
+                    return instance;
+                });
+            timeSpanArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanArray(instance) = value;
+                    return instance;
+                });
+            timeSpanArray.SetAccessors(
+                TimeSpan[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan[] (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan[]>(timeSpanArray, 226),
+                TimeSpan[] (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan[]>(timeSpanArray));
+            timeSpanArray.SetPropertyIndexes(
+                index: 226,
+                originalValueIndex: 226,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeSpanArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<TimeSpan[], TimeSpan>(new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v)),
+                keyComparer: new ListOfValueTypesComparer<TimeSpan[], TimeSpan>(new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<TimeSpan>(new JsonCollectionOfStructsReaderWriter<TimeSpan[], TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<TimeSpan[], TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance),
+                elementMapping: JetTimeSpanTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v),
+                    keyComparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v),
+                    providerValueComparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v)));
+            var timeSpanArrayElementType = timeSpanArray.SetElementType(typeof(TimeSpan));
+            timeSpanArrayElementType.TypeMapping = timeSpanArray.TypeMapping.ElementTypeMapping;
+
+            var timeSpanToStringConverterProperty = runtimeEntityType.AddProperty(
+                "TimeSpanToStringConverterProperty",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeSpanToStringConverter());
+            timeSpanToStringConverterProperty.SetGetter(
+                TimeSpan (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(instance) == default(TimeSpan));
+            timeSpanToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeSpanToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeSpanToStringConverterProperty.SetAccessors(
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan>(timeSpanToStringConverterProperty, 227),
+                TimeSpan (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan>(timeSpanToStringConverterProperty));
+            timeSpanToStringConverterProperty.SetPropertyIndexes(
+                index: 227,
+                originalValueIndex: 227,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeSpanToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<TimeSpan, string>(
+                    string (TimeSpan v) => v.ToString("c"),
+                    TimeSpan (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeSpan, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<TimeSpan, string>(
+                        string (TimeSpan v) => v.ToString("c"),
+                        TimeSpan (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture))));
+            timeSpanToStringConverterProperty.SetSentinelFromProviderValue("00:00:00");
+
+            var timeSpanToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "TimeSpanToTicksConverterProperty",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeSpanToTicksConverter());
+            timeSpanToTicksConverterProperty.SetGetter(
+                TimeSpan (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(instance) == default(TimeSpan));
+            timeSpanToTicksConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeSpanToTicksConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeSpanToTicksConverterProperty.SetAccessors(
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan>(timeSpanToTicksConverterProperty, 228),
+                TimeSpan (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan>(timeSpanToTicksConverterProperty));
+            timeSpanToTicksConverterProperty.SetPropertyIndexes(
+                index: 228,
+                originalValueIndex: 228,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeSpanToTicksConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<TimeSpan, long>(
+                    long (TimeSpan v) => v.Ticks,
+                    TimeSpan (long v) => new TimeSpan(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeSpan, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<TimeSpan, long>(
+                        long (TimeSpan v) => v.Ticks,
+                        TimeSpan (long v) => new TimeSpan(v))));
+            timeSpanToTicksConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var uInt16 = runtimeEntityType.AddProperty(
+                "UInt16",
+                typeof(ushort),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt16.SetGetter(
+                ushort (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt16(instance) == 0);
+            uInt16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt16(instance) = value;
+                    return instance;
+                });
+            uInt16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt16(instance) = value;
+                    return instance;
+                });
+            uInt16.SetAccessors(
+                ushort (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort (IInternalEntry entry) => entry.ReadOriginalValue<ushort>(uInt16, 229),
+                ushort (IInternalEntry entry) => entry.GetCurrentValue<ushort>(uInt16));
+            uInt16.SetPropertyIndexes(
+                index: 229,
+                originalValueIndex: 229,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt16.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v),
+                keyComparer: new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<ushort, int>(
+                    int (ushort v) => ((int)v),
+                    ushort (int v) => ((ushort)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ushort, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<ushort, int>(
+                        int (ushort v) => ((int)v),
+                        ushort (int v) => ((ushort)v))));
+            uInt16.SetSentinelFromProviderValue(0);
+
+            var uInt16Array = runtimeEntityType.AddProperty(
+                "UInt16Array",
+                typeof(ushort[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt16Array.SetGetter(
+                ushort[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt16Array(instance) == null);
+            uInt16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt16Array(instance) = value;
+                    return instance;
+                });
+            uInt16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt16Array(instance) = value;
+                    return instance;
+                });
+            uInt16Array.SetAccessors(
+                ushort[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort[] (IInternalEntry entry) => entry.ReadOriginalValue<ushort[]>(uInt16Array, 230),
+                ushort[] (IInternalEntry entry) => entry.GetCurrentValue<ushort[]>(uInt16Array));
+            uInt16Array.SetPropertyIndexes(
+                index: 230,
+                originalValueIndex: 230,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<ushort[], ushort>(new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v)),
+                keyComparer: new ListOfValueTypesComparer<ushort[], ushort>(new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<ushort>(new JsonCollectionOfStructsReaderWriter<ushort[], ushort>(
+                    new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<ushort[], ushort>(
+                    new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ushort>(
+                        bool (ushort v1, ushort v2) => v1 == v2,
+                        int (ushort v) => ((int)v),
+                        ushort (ushort v) => v),
+                    keyComparer: new ValueComparer<ushort>(
+                        bool (ushort v1, ushort v2) => v1 == v2,
+                        int (ushort v) => ((int)v),
+                        ushort (ushort v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<ushort, int>(
+                        int (ushort v) => ((int)v),
+                        ushort (int v) => ((ushort)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v)))));
+            var uInt16ArrayElementType = uInt16Array.SetElementType(typeof(ushort));
+            uInt16ArrayElementType.TypeMapping = uInt16Array.TypeMapping.ElementTypeMapping;
+
+            var uInt32 = runtimeEntityType.AddProperty(
+                "UInt32",
+                typeof(uint),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt32.SetGetter(
+                uint (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt32(instance) == 0U);
+            uInt32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt32(instance) = value;
+                    return instance;
+                });
+            uInt32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt32(instance) = value;
+                    return instance;
+                });
+            uInt32.SetAccessors(
+                uint (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint (IInternalEntry entry) => entry.ReadOriginalValue<uint>(uInt32, 231),
+                uint (IInternalEntry entry) => entry.GetCurrentValue<uint>(uInt32));
+            uInt32.SetPropertyIndexes(
+                index: 231,
+                originalValueIndex: 231,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt32.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v),
+                keyComparer: new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<uint, long>(
+                    long (uint v) => ((long)v),
+                    uint (long v) => ((uint)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<uint, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<uint, long>(
+                        long (uint v) => ((long)v),
+                        uint (long v) => ((uint)v))));
+            uInt32.SetSentinelFromProviderValue(0L);
+
+            var uInt32Array = runtimeEntityType.AddProperty(
+                "UInt32Array",
+                typeof(uint[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt32Array.SetGetter(
+                uint[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt32Array(instance) == null);
+            uInt32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt32Array(instance) = value;
+                    return instance;
+                });
+            uInt32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt32Array(instance) = value;
+                    return instance;
+                });
+            uInt32Array.SetAccessors(
+                uint[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint[] (IInternalEntry entry) => entry.ReadOriginalValue<uint[]>(uInt32Array, 232),
+                uint[] (IInternalEntry entry) => entry.GetCurrentValue<uint[]>(uInt32Array));
+            uInt32Array.SetPropertyIndexes(
+                index: 232,
+                originalValueIndex: 232,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<uint[], uint>(new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v)),
+                keyComparer: new ListOfValueTypesComparer<uint[], uint>(new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<uint>(new JsonCollectionOfStructsReaderWriter<uint[], uint>(
+                    new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<uint[], uint>(
+                    new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<uint>(
+                        bool (uint v1, uint v2) => v1 == v2,
+                        int (uint v) => ((int)v),
+                        uint (uint v) => v),
+                    keyComparer: new ValueComparer<uint>(
+                        bool (uint v1, uint v2) => v1 == v2,
+                        int (uint v) => ((int)v),
+                        uint (uint v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<uint, long>(
+                        long (uint v) => ((long)v),
+                        uint (long v) => ((uint)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v)))));
+            var uInt32ArrayElementType = uInt32Array.SetElementType(typeof(uint));
+            uInt32ArrayElementType.TypeMapping = uInt32Array.TypeMapping.ElementTypeMapping;
+
+            var uInt64 = runtimeEntityType.AddProperty(
+                "UInt64",
+                typeof(ulong),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt64.SetGetter(
+                ulong (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt64(instance) == 0UL);
+            uInt64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt64(instance) = value;
+                    return instance;
+                });
+            uInt64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt64(instance) = value;
+                    return instance;
+                });
+            uInt64.SetAccessors(
+                ulong (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong (IInternalEntry entry) => entry.ReadOriginalValue<ulong>(uInt64, 233),
+                ulong (IInternalEntry entry) => entry.GetCurrentValue<ulong>(uInt64));
+            uInt64.SetPropertyIndexes(
+                index: 233,
+                originalValueIndex: 233,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt64.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v),
+                keyComparer: new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<ulong, decimal>(
+                    decimal (ulong v) => ((decimal)v),
+                    ulong (decimal v) => ((ulong)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ulong, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<ulong, decimal>(
+                        decimal (ulong v) => ((decimal)v),
+                        ulong (decimal v) => ((ulong)v))));
+            uInt64.SetSentinelFromProviderValue(0m);
+
+            var uInt64Array = runtimeEntityType.AddProperty(
+                "UInt64Array",
+                typeof(ulong[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt64Array.SetGetter(
+                ulong[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt64Array(instance) == null);
+            uInt64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt64Array(instance) = value;
+                    return instance;
+                });
+            uInt64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt64Array(instance) = value;
+                    return instance;
+                });
+            uInt64Array.SetAccessors(
+                ulong[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong[] (IInternalEntry entry) => entry.ReadOriginalValue<ulong[]>(uInt64Array, 234),
+                ulong[] (IInternalEntry entry) => entry.GetCurrentValue<ulong[]>(uInt64Array));
+            uInt64Array.SetPropertyIndexes(
+                index: 234,
+                originalValueIndex: 234,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<ulong[], ulong>(new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v)),
+                keyComparer: new ListOfValueTypesComparer<ulong[], ulong>(new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<ulong>(new JsonCollectionOfStructsReaderWriter<ulong[], ulong>(
+                    new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<ulong[], ulong>(
+                    new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v)))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ulong>(
+                        bool (ulong v1, ulong v2) => v1 == v2,
+                        int (ulong v) => ((object)v).GetHashCode(),
+                        ulong (ulong v) => v),
+                    keyComparer: new ValueComparer<ulong>(
+                        bool (ulong v1, ulong v2) => v1 == v2,
+                        int (ulong v) => ((object)v).GetHashCode(),
+                        ulong (ulong v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<ulong, decimal>(
+                        decimal (ulong v) => ((decimal)v),
+                        ulong (decimal v) => ((ulong)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v)))));
+            var uInt64ArrayElementType = uInt64Array.SetElementType(typeof(ulong));
+            uInt64ArrayElementType.TypeMapping = uInt64Array.TypeMapping.ElementTypeMapping;
+
+            var uInt8 = runtimeEntityType.AddProperty(
+                "UInt8",
+                typeof(byte),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (byte)0);
+            uInt8.SetGetter(
+                byte (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt8(instance) == 0);
+            uInt8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt8(instance) = value;
+                    return instance;
+                });
+            uInt8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt8(instance) = value;
+                    return instance;
+                });
+            uInt8.SetAccessors(
+                byte (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte (IInternalEntry entry) => entry.ReadOriginalValue<byte>(uInt8, 235),
+                byte (IInternalEntry entry) => entry.GetCurrentValue<byte>(uInt8));
+            uInt8.SetPropertyIndexes(
+                index: 235,
+                originalValueIndex: 235,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt8.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                keyComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v));
+
+            var uInt8Array = runtimeEntityType.AddProperty(
+                "UInt8Array",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt8Array.SetGetter(
+                byte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt8Array(instance) == null);
+            uInt8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt8Array(instance) = value;
+                    return instance;
+                });
+            uInt8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt8Array(instance) = value;
+                    return instance;
+                });
+            uInt8Array.SetAccessors(
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(uInt8Array, 236),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(uInt8Array));
+            uInt8Array.SetPropertyIndexes(
+                index: 236,
+                originalValueIndex: 236,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt8Array.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var uInt8ReadOnlyCollection = runtimeEntityType.AddProperty(
+                "UInt8ReadOnlyCollection",
+                typeof(IReadOnlyCollection<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8ReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_uInt8ReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt8ReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<byte> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<byte>)(ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance) == null);
+            uInt8ReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<byte> value) =>
+                {
+                    ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance) = ((List<byte>)value);
+                    return instance;
+                });
+            uInt8ReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<byte> value) =>
+                {
+                    ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance) = ((List<byte>)value);
+                    return instance;
+                });
+            uInt8ReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<byte> (IInternalEntry entry) => ((IReadOnlyCollection<byte>)(ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<byte> (IInternalEntry entry) => ((IReadOnlyCollection<byte>)(ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<byte>>(uInt8ReadOnlyCollection, 237),
+                IReadOnlyCollection<byte> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<byte>>(uInt8ReadOnlyCollection));
+            uInt8ReadOnlyCollection.SetPropertyIndexes(
+                index: 237,
+                originalValueIndex: 237,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt8ReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var uInt8ReadOnlyCollectionElementType = uInt8ReadOnlyCollection.SetElementType(typeof(byte));
+            uInt8ReadOnlyCollectionElementType.TypeMapping = uInt8ReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var uri = runtimeEntityType.AddProperty(
+                "Uri",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Uri", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Uri>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uri.SetGetter(
+                Uri (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Uri(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Uri(instance) == null);
+            uri.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.Uri(instance) = value;
+                    return instance;
+                });
+            uri.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.Uri(instance) = value;
+                    return instance;
+                });
+            uri.SetAccessors(
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.Uri(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.Uri(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => entry.ReadOriginalValue<Uri>(uri, 238),
+                Uri (IInternalEntry entry) => entry.GetCurrentValue<Uri>(uri));
+            uri.SetPropertyIndexes(
+                index: 238,
+                originalValueIndex: 238,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uri.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                keyComparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<Uri, string>(
+                    string (Uri v) => ((object)v).ToString(),
+                    Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))));
+
+            var uriArray = runtimeEntityType.AddProperty(
+                "UriArray",
+                typeof(Uri[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UriArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UriArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uriArray.SetGetter(
+                Uri[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UriArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UriArray(instance) == null);
+            uriArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UriArray(instance) = value;
+                    return instance;
+                });
+            uriArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UriArray(instance) = value;
+                    return instance;
+                });
+            uriArray.SetAccessors(
+                Uri[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UriArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UriArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri[] (IInternalEntry entry) => entry.ReadOriginalValue<Uri[]>(uriArray, 239),
+                Uri[] (IInternalEntry entry) => entry.GetCurrentValue<Uri[]>(uriArray));
+            uriArray.SetPropertyIndexes(
+                index: 239,
+                originalValueIndex: 239,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uriArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<Uri[], Uri>(new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<Uri[], Uri>(new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<Uri>(new JsonCollectionOfReferencesReaderWriter<Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Uri>(
+                        bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (Uri v) => ((object)v).GetHashCode(),
+                        Uri (Uri v) => v),
+                    keyComparer: new ValueComparer<Uri>(
+                        bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (Uri v) => ((object)v).GetHashCode(),
+                        Uri (Uri v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))));
+            var uriArrayElementType = uriArray.SetElementType(typeof(Uri));
+            uriArrayElementType.TypeMapping = uriArray.TypeMapping.ElementTypeMapping;
+
+            var uriToStringConverterProperty = runtimeEntityType.AddProperty(
+                "UriToStringConverterProperty",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UriToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UriToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new UriToStringConverter());
+            uriToStringConverterProperty.SetGetter(
+                Uri (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UriToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UriToStringConverterProperty(instance) == null);
+            uriToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.UriToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            uriToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.UriToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            uriToStringConverterProperty.SetAccessors(
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.UriToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.UriToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => entry.ReadOriginalValue<Uri>(uriToStringConverterProperty, 240),
+                Uri (IInternalEntry entry) => entry.GetCurrentValue<Uri>(uriToStringConverterProperty));
+            uriToStringConverterProperty.SetPropertyIndexes(
+                index: 240,
+                originalValueIndex: 240,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uriToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                keyComparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<Uri, string>(
+                    string (Uri v) => ((object)v).ToString(),
+                    Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var @bool = runtimeEntityType.FindProperty("Bool");
+            var boolArray = runtimeEntityType.FindProperty("BoolArray");
+            var boolReadOnlyCollection = runtimeEntityType.FindProperty("BoolReadOnlyCollection");
+            var boolToStringConverterProperty = runtimeEntityType.FindProperty("BoolToStringConverterProperty");
+            var boolToTwoValuesConverterProperty = runtimeEntityType.FindProperty("BoolToTwoValuesConverterProperty");
+            var boolToZeroOneConverterProperty = runtimeEntityType.FindProperty("BoolToZeroOneConverterProperty");
+            var bytes = runtimeEntityType.FindProperty("Bytes");
+            var bytesArray = runtimeEntityType.FindProperty("BytesArray");
+            var bytesToStringConverterProperty = runtimeEntityType.FindProperty("BytesToStringConverterProperty");
+            var castingConverterProperty = runtimeEntityType.FindProperty("CastingConverterProperty");
+            var @char = runtimeEntityType.FindProperty("Char");
+            var charArray = runtimeEntityType.FindProperty("CharArray");
+            var charToStringConverterProperty = runtimeEntityType.FindProperty("CharToStringConverterProperty");
+            var dateOnly = runtimeEntityType.FindProperty("DateOnly");
+            var dateOnlyArray = runtimeEntityType.FindProperty("DateOnlyArray");
+            var dateOnlyToStringConverterProperty = runtimeEntityType.FindProperty("DateOnlyToStringConverterProperty");
+            var dateTime = runtimeEntityType.FindProperty("DateTime");
+            var dateTimeArray = runtimeEntityType.FindProperty("DateTimeArray");
+            var dateTimeOffsetToBinaryConverterProperty = runtimeEntityType.FindProperty("DateTimeOffsetToBinaryConverterProperty");
+            var dateTimeOffsetToBytesConverterProperty = runtimeEntityType.FindProperty("DateTimeOffsetToBytesConverterProperty");
+            var dateTimeOffsetToStringConverterProperty = runtimeEntityType.FindProperty("DateTimeOffsetToStringConverterProperty");
+            var dateTimeToBinaryConverterProperty = runtimeEntityType.FindProperty("DateTimeToBinaryConverterProperty");
+            var dateTimeToStringConverterProperty = runtimeEntityType.FindProperty("DateTimeToStringConverterProperty");
+            var dateTimeToTicksConverterProperty = runtimeEntityType.FindProperty("DateTimeToTicksConverterProperty");
+            var @decimal = runtimeEntityType.FindProperty("Decimal");
+            var decimalArray = runtimeEntityType.FindProperty("DecimalArray");
+            var decimalNumberToBytesConverterProperty = runtimeEntityType.FindProperty("DecimalNumberToBytesConverterProperty");
+            var decimalNumberToStringConverterProperty = runtimeEntityType.FindProperty("DecimalNumberToStringConverterProperty");
+            var @double = runtimeEntityType.FindProperty("Double");
+            var doubleArray = runtimeEntityType.FindProperty("DoubleArray");
+            var doubleNumberToBytesConverterProperty = runtimeEntityType.FindProperty("DoubleNumberToBytesConverterProperty");
+            var doubleNumberToStringConverterProperty = runtimeEntityType.FindProperty("DoubleNumberToStringConverterProperty");
+            var enum16 = runtimeEntityType.FindProperty("Enum16");
+            var enum16Array = runtimeEntityType.FindProperty("Enum16Array");
+            var enum16AsString = runtimeEntityType.FindProperty("Enum16AsString");
+            var enum16AsStringArray = runtimeEntityType.FindProperty("Enum16AsStringArray");
+            var enum16AsStringCollection = runtimeEntityType.FindProperty("Enum16AsStringCollection");
+            var enum16Collection = runtimeEntityType.FindProperty("Enum16Collection");
+            var enum32 = runtimeEntityType.FindProperty("Enum32");
+            var enum32Array = runtimeEntityType.FindProperty("Enum32Array");
+            var enum32AsString = runtimeEntityType.FindProperty("Enum32AsString");
+            var enum32AsStringArray = runtimeEntityType.FindProperty("Enum32AsStringArray");
+            var enum32AsStringCollection = runtimeEntityType.FindProperty("Enum32AsStringCollection");
+            var enum32Collection = runtimeEntityType.FindProperty("Enum32Collection");
+            var enum64 = runtimeEntityType.FindProperty("Enum64");
+            var enum64Array = runtimeEntityType.FindProperty("Enum64Array");
+            var enum64AsString = runtimeEntityType.FindProperty("Enum64AsString");
+            var enum64AsStringArray = runtimeEntityType.FindProperty("Enum64AsStringArray");
+            var enum64AsStringCollection = runtimeEntityType.FindProperty("Enum64AsStringCollection");
+            var enum64Collection = runtimeEntityType.FindProperty("Enum64Collection");
+            var enum8 = runtimeEntityType.FindProperty("Enum8");
+            var enum8Array = runtimeEntityType.FindProperty("Enum8Array");
+            var enum8AsString = runtimeEntityType.FindProperty("Enum8AsString");
+            var enum8AsStringArray = runtimeEntityType.FindProperty("Enum8AsStringArray");
+            var enum8AsStringCollection = runtimeEntityType.FindProperty("Enum8AsStringCollection");
+            var enum8Collection = runtimeEntityType.FindProperty("Enum8Collection");
+            var enumToNumberConverterProperty = runtimeEntityType.FindProperty("EnumToNumberConverterProperty");
+            var enumToStringConverterProperty = runtimeEntityType.FindProperty("EnumToStringConverterProperty");
+            var enumU16 = runtimeEntityType.FindProperty("EnumU16");
+            var enumU16Array = runtimeEntityType.FindProperty("EnumU16Array");
+            var enumU16AsString = runtimeEntityType.FindProperty("EnumU16AsString");
+            var enumU16AsStringArray = runtimeEntityType.FindProperty("EnumU16AsStringArray");
+            var enumU16AsStringCollection = runtimeEntityType.FindProperty("EnumU16AsStringCollection");
+            var enumU16Collection = runtimeEntityType.FindProperty("EnumU16Collection");
+            var enumU32 = runtimeEntityType.FindProperty("EnumU32");
+            var enumU32Array = runtimeEntityType.FindProperty("EnumU32Array");
+            var enumU32AsString = runtimeEntityType.FindProperty("EnumU32AsString");
+            var enumU32AsStringArray = runtimeEntityType.FindProperty("EnumU32AsStringArray");
+            var enumU32AsStringCollection = runtimeEntityType.FindProperty("EnumU32AsStringCollection");
+            var enumU32Collection = runtimeEntityType.FindProperty("EnumU32Collection");
+            var enumU64 = runtimeEntityType.FindProperty("EnumU64");
+            var enumU64Array = runtimeEntityType.FindProperty("EnumU64Array");
+            var enumU64AsString = runtimeEntityType.FindProperty("EnumU64AsString");
+            var enumU64AsStringArray = runtimeEntityType.FindProperty("EnumU64AsStringArray");
+            var enumU64AsStringCollection = runtimeEntityType.FindProperty("EnumU64AsStringCollection");
+            var enumU64Collection = runtimeEntityType.FindProperty("EnumU64Collection");
+            var enumU8 = runtimeEntityType.FindProperty("EnumU8");
+            var enumU8Array = runtimeEntityType.FindProperty("EnumU8Array");
+            var enumU8AsString = runtimeEntityType.FindProperty("EnumU8AsString");
+            var enumU8AsStringArray = runtimeEntityType.FindProperty("EnumU8AsStringArray");
+            var enumU8AsStringCollection = runtimeEntityType.FindProperty("EnumU8AsStringCollection");
+            var enumU8Collection = runtimeEntityType.FindProperty("EnumU8Collection");
+            var @float = runtimeEntityType.FindProperty("Float");
+            var floatArray = runtimeEntityType.FindProperty("FloatArray");
+            var guid = runtimeEntityType.FindProperty("Guid");
+            var guidArray = runtimeEntityType.FindProperty("GuidArray");
+            var guidToBytesConverterProperty = runtimeEntityType.FindProperty("GuidToBytesConverterProperty");
+            var guidToStringConverterProperty = runtimeEntityType.FindProperty("GuidToStringConverterProperty");
+            var iPAddress = runtimeEntityType.FindProperty("IPAddress");
+            var iPAddressArray = runtimeEntityType.FindProperty("IPAddressArray");
+            var iPAddressReadOnlyCollection = runtimeEntityType.FindProperty("IPAddressReadOnlyCollection");
+            var iPAddressToBytesConverterProperty = runtimeEntityType.FindProperty("IPAddressToBytesConverterProperty");
+            var iPAddressToStringConverterProperty = runtimeEntityType.FindProperty("IPAddressToStringConverterProperty");
+            var int16 = runtimeEntityType.FindProperty("Int16");
+            var int16Array = runtimeEntityType.FindProperty("Int16Array");
+            var int32 = runtimeEntityType.FindProperty("Int32");
+            var int32Array = runtimeEntityType.FindProperty("Int32Array");
+            var int32ReadOnlyCollection = runtimeEntityType.FindProperty("Int32ReadOnlyCollection");
+            var int64 = runtimeEntityType.FindProperty("Int64");
+            var int64Array = runtimeEntityType.FindProperty("Int64Array");
+            var int8 = runtimeEntityType.FindProperty("Int8");
+            var int8Array = runtimeEntityType.FindProperty("Int8Array");
+            var intNumberToBytesConverterProperty = runtimeEntityType.FindProperty("IntNumberToBytesConverterProperty");
+            var intNumberToStringConverterProperty = runtimeEntityType.FindProperty("IntNumberToStringConverterProperty");
+            var nullIntToNullStringConverterProperty = runtimeEntityType.FindProperty("NullIntToNullStringConverterProperty");
+            var nullableBool = runtimeEntityType.FindProperty("NullableBool");
+            var nullableBoolArray = runtimeEntityType.FindProperty("NullableBoolArray");
+            var nullableBytes = runtimeEntityType.FindProperty("NullableBytes");
+            var nullableBytesArray = runtimeEntityType.FindProperty("NullableBytesArray");
+            var nullableChar = runtimeEntityType.FindProperty("NullableChar");
+            var nullableCharArray = runtimeEntityType.FindProperty("NullableCharArray");
+            var nullableDateOnly = runtimeEntityType.FindProperty("NullableDateOnly");
+            var nullableDateOnlyArray = runtimeEntityType.FindProperty("NullableDateOnlyArray");
+            var nullableDateTime = runtimeEntityType.FindProperty("NullableDateTime");
+            var nullableDateTimeArray = runtimeEntityType.FindProperty("NullableDateTimeArray");
+            var nullableDecimal = runtimeEntityType.FindProperty("NullableDecimal");
+            var nullableDecimalArray = runtimeEntityType.FindProperty("NullableDecimalArray");
+            var nullableDouble = runtimeEntityType.FindProperty("NullableDouble");
+            var nullableDoubleArray = runtimeEntityType.FindProperty("NullableDoubleArray");
+            var nullableEnum16 = runtimeEntityType.FindProperty("NullableEnum16");
+            var nullableEnum16Array = runtimeEntityType.FindProperty("NullableEnum16Array");
+            var nullableEnum16AsString = runtimeEntityType.FindProperty("NullableEnum16AsString");
+            var nullableEnum16AsStringArray = runtimeEntityType.FindProperty("NullableEnum16AsStringArray");
+            var nullableEnum16AsStringCollection = runtimeEntityType.FindProperty("NullableEnum16AsStringCollection");
+            var nullableEnum16Collection = runtimeEntityType.FindProperty("NullableEnum16Collection");
+            var nullableEnum32 = runtimeEntityType.FindProperty("NullableEnum32");
+            var nullableEnum32Array = runtimeEntityType.FindProperty("NullableEnum32Array");
+            var nullableEnum32AsString = runtimeEntityType.FindProperty("NullableEnum32AsString");
+            var nullableEnum32AsStringArray = runtimeEntityType.FindProperty("NullableEnum32AsStringArray");
+            var nullableEnum32AsStringCollection = runtimeEntityType.FindProperty("NullableEnum32AsStringCollection");
+            var nullableEnum32Collection = runtimeEntityType.FindProperty("NullableEnum32Collection");
+            var nullableEnum64 = runtimeEntityType.FindProperty("NullableEnum64");
+            var nullableEnum64Array = runtimeEntityType.FindProperty("NullableEnum64Array");
+            var nullableEnum64AsString = runtimeEntityType.FindProperty("NullableEnum64AsString");
+            var nullableEnum64AsStringArray = runtimeEntityType.FindProperty("NullableEnum64AsStringArray");
+            var nullableEnum64AsStringCollection = runtimeEntityType.FindProperty("NullableEnum64AsStringCollection");
+            var nullableEnum64Collection = runtimeEntityType.FindProperty("NullableEnum64Collection");
+            var nullableEnum8 = runtimeEntityType.FindProperty("NullableEnum8");
+            var nullableEnum8Array = runtimeEntityType.FindProperty("NullableEnum8Array");
+            var nullableEnum8AsString = runtimeEntityType.FindProperty("NullableEnum8AsString");
+            var nullableEnum8AsStringArray = runtimeEntityType.FindProperty("NullableEnum8AsStringArray");
+            var nullableEnum8AsStringCollection = runtimeEntityType.FindProperty("NullableEnum8AsStringCollection");
+            var nullableEnum8Collection = runtimeEntityType.FindProperty("NullableEnum8Collection");
+            var nullableEnumU16 = runtimeEntityType.FindProperty("NullableEnumU16");
+            var nullableEnumU16Array = runtimeEntityType.FindProperty("NullableEnumU16Array");
+            var nullableEnumU16AsString = runtimeEntityType.FindProperty("NullableEnumU16AsString");
+            var nullableEnumU16AsStringArray = runtimeEntityType.FindProperty("NullableEnumU16AsStringArray");
+            var nullableEnumU16AsStringCollection = runtimeEntityType.FindProperty("NullableEnumU16AsStringCollection");
+            var nullableEnumU16Collection = runtimeEntityType.FindProperty("NullableEnumU16Collection");
+            var nullableEnumU32 = runtimeEntityType.FindProperty("NullableEnumU32");
+            var nullableEnumU32Array = runtimeEntityType.FindProperty("NullableEnumU32Array");
+            var nullableEnumU32AsString = runtimeEntityType.FindProperty("NullableEnumU32AsString");
+            var nullableEnumU32AsStringArray = runtimeEntityType.FindProperty("NullableEnumU32AsStringArray");
+            var nullableEnumU32AsStringCollection = runtimeEntityType.FindProperty("NullableEnumU32AsStringCollection");
+            var nullableEnumU32Collection = runtimeEntityType.FindProperty("NullableEnumU32Collection");
+            var nullableEnumU64 = runtimeEntityType.FindProperty("NullableEnumU64");
+            var nullableEnumU64Array = runtimeEntityType.FindProperty("NullableEnumU64Array");
+            var nullableEnumU64AsString = runtimeEntityType.FindProperty("NullableEnumU64AsString");
+            var nullableEnumU64AsStringArray = runtimeEntityType.FindProperty("NullableEnumU64AsStringArray");
+            var nullableEnumU64AsStringCollection = runtimeEntityType.FindProperty("NullableEnumU64AsStringCollection");
+            var nullableEnumU64Collection = runtimeEntityType.FindProperty("NullableEnumU64Collection");
+            var nullableEnumU8 = runtimeEntityType.FindProperty("NullableEnumU8");
+            var nullableEnumU8Array = runtimeEntityType.FindProperty("NullableEnumU8Array");
+            var nullableEnumU8AsString = runtimeEntityType.FindProperty("NullableEnumU8AsString");
+            var nullableEnumU8AsStringArray = runtimeEntityType.FindProperty("NullableEnumU8AsStringArray");
+            var nullableEnumU8AsStringCollection = runtimeEntityType.FindProperty("NullableEnumU8AsStringCollection");
+            var nullableEnumU8Collection = runtimeEntityType.FindProperty("NullableEnumU8Collection");
+            var nullableFloat = runtimeEntityType.FindProperty("NullableFloat");
+            var nullableFloatArray = runtimeEntityType.FindProperty("NullableFloatArray");
+            var nullableGuid = runtimeEntityType.FindProperty("NullableGuid");
+            var nullableGuidArray = runtimeEntityType.FindProperty("NullableGuidArray");
+            var nullableIPAddress = runtimeEntityType.FindProperty("NullableIPAddress");
+            var nullableIPAddressArray = runtimeEntityType.FindProperty("NullableIPAddressArray");
+            var nullableInt16 = runtimeEntityType.FindProperty("NullableInt16");
+            var nullableInt16Array = runtimeEntityType.FindProperty("NullableInt16Array");
+            var nullableInt32 = runtimeEntityType.FindProperty("NullableInt32");
+            var nullableInt32Array = runtimeEntityType.FindProperty("NullableInt32Array");
+            var nullableInt64 = runtimeEntityType.FindProperty("NullableInt64");
+            var nullableInt64Array = runtimeEntityType.FindProperty("NullableInt64Array");
+            var nullableInt8 = runtimeEntityType.FindProperty("NullableInt8");
+            var nullableInt8Array = runtimeEntityType.FindProperty("NullableInt8Array");
+            var nullablePhysicalAddress = runtimeEntityType.FindProperty("NullablePhysicalAddress");
+            var nullablePhysicalAddressArray = runtimeEntityType.FindProperty("NullablePhysicalAddressArray");
+            var nullableString = runtimeEntityType.FindProperty("NullableString");
+            var nullableStringArray = runtimeEntityType.FindProperty("NullableStringArray");
+            var nullableTimeOnly = runtimeEntityType.FindProperty("NullableTimeOnly");
+            var nullableTimeOnlyArray = runtimeEntityType.FindProperty("NullableTimeOnlyArray");
+            var nullableTimeSpan = runtimeEntityType.FindProperty("NullableTimeSpan");
+            var nullableTimeSpanArray = runtimeEntityType.FindProperty("NullableTimeSpanArray");
+            var nullableUInt16 = runtimeEntityType.FindProperty("NullableUInt16");
+            var nullableUInt16Array = runtimeEntityType.FindProperty("NullableUInt16Array");
+            var nullableUInt32 = runtimeEntityType.FindProperty("NullableUInt32");
+            var nullableUInt32Array = runtimeEntityType.FindProperty("NullableUInt32Array");
+            var nullableUInt64 = runtimeEntityType.FindProperty("NullableUInt64");
+            var nullableUInt64Array = runtimeEntityType.FindProperty("NullableUInt64Array");
+            var nullableUInt8 = runtimeEntityType.FindProperty("NullableUInt8");
+            var nullableUInt8Array = runtimeEntityType.FindProperty("NullableUInt8Array");
+            var nullableUri = runtimeEntityType.FindProperty("NullableUri");
+            var nullableUriArray = runtimeEntityType.FindProperty("NullableUriArray");
+            var physicalAddress = runtimeEntityType.FindProperty("PhysicalAddress");
+            var physicalAddressArray = runtimeEntityType.FindProperty("PhysicalAddressArray");
+            var physicalAddressToBytesConverterProperty = runtimeEntityType.FindProperty("PhysicalAddressToBytesConverterProperty");
+            var physicalAddressToStringConverterProperty = runtimeEntityType.FindProperty("PhysicalAddressToStringConverterProperty");
+            var @string = runtimeEntityType.FindProperty("String");
+            var stringArray = runtimeEntityType.FindProperty("StringArray");
+            var stringReadOnlyCollection = runtimeEntityType.FindProperty("StringReadOnlyCollection");
+            var stringToBoolConverterProperty = runtimeEntityType.FindProperty("StringToBoolConverterProperty");
+            var stringToBytesConverterProperty = runtimeEntityType.FindProperty("StringToBytesConverterProperty");
+            var stringToCharConverterProperty = runtimeEntityType.FindProperty("StringToCharConverterProperty");
+            var stringToDateOnlyConverterProperty = runtimeEntityType.FindProperty("StringToDateOnlyConverterProperty");
+            var stringToDateTimeConverterProperty = runtimeEntityType.FindProperty("StringToDateTimeConverterProperty");
+            var stringToDateTimeOffsetConverterProperty = runtimeEntityType.FindProperty("StringToDateTimeOffsetConverterProperty");
+            var stringToDecimalNumberConverterProperty = runtimeEntityType.FindProperty("StringToDecimalNumberConverterProperty");
+            var stringToDoubleNumberConverterProperty = runtimeEntityType.FindProperty("StringToDoubleNumberConverterProperty");
+            var stringToEnumConverterProperty = runtimeEntityType.FindProperty("StringToEnumConverterProperty");
+            var stringToGuidConverterProperty = runtimeEntityType.FindProperty("StringToGuidConverterProperty");
+            var stringToIntNumberConverterProperty = runtimeEntityType.FindProperty("StringToIntNumberConverterProperty");
+            var stringToTimeOnlyConverterProperty = runtimeEntityType.FindProperty("StringToTimeOnlyConverterProperty");
+            var stringToTimeSpanConverterProperty = runtimeEntityType.FindProperty("StringToTimeSpanConverterProperty");
+            var stringToUriConverterProperty = runtimeEntityType.FindProperty("StringToUriConverterProperty");
+            var timeOnly = runtimeEntityType.FindProperty("TimeOnly");
+            var timeOnlyArray = runtimeEntityType.FindProperty("TimeOnlyArray");
+            var timeOnlyToStringConverterProperty = runtimeEntityType.FindProperty("TimeOnlyToStringConverterProperty");
+            var timeOnlyToTicksConverterProperty = runtimeEntityType.FindProperty("TimeOnlyToTicksConverterProperty");
+            var timeSpan = runtimeEntityType.FindProperty("TimeSpan");
+            var timeSpanArray = runtimeEntityType.FindProperty("TimeSpanArray");
+            var timeSpanToStringConverterProperty = runtimeEntityType.FindProperty("TimeSpanToStringConverterProperty");
+            var timeSpanToTicksConverterProperty = runtimeEntityType.FindProperty("TimeSpanToTicksConverterProperty");
+            var uInt16 = runtimeEntityType.FindProperty("UInt16");
+            var uInt16Array = runtimeEntityType.FindProperty("UInt16Array");
+            var uInt32 = runtimeEntityType.FindProperty("UInt32");
+            var uInt32Array = runtimeEntityType.FindProperty("UInt32Array");
+            var uInt64 = runtimeEntityType.FindProperty("UInt64");
+            var uInt64Array = runtimeEntityType.FindProperty("UInt64Array");
+            var uInt8 = runtimeEntityType.FindProperty("UInt8");
+            var uInt8Array = runtimeEntityType.FindProperty("UInt8Array");
+            var uInt8ReadOnlyCollection = runtimeEntityType.FindProperty("UInt8ReadOnlyCollection");
+            var uri = runtimeEntityType.FindProperty("Uri");
+            var uriArray = runtimeEntityType.FindProperty("UriArray");
+            var uriToStringConverterProperty = runtimeEntityType.FindProperty("UriToStringConverterProperty");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNonNullableFactory<CompiledModelTestBase.ManyTypesId>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<CompiledModelTestBase.ManyTypesId>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg = ((ISnapshot)(new Snapshot<CompiledModelTestBase.ManyTypesId, bool, bool[], IReadOnlyCollection<bool>, bool, bool, bool, byte[], byte[][], byte[], int, char, char[], char, DateOnly, DateOnly[], DateOnly, DateTime, DateTime[], DateTimeOffset, DateTimeOffset, DateTimeOffset, DateTime, DateTime, DateTime, decimal, decimal[], decimal, decimal, double>(((ValueComparer<CompiledModelTestBase.ManyTypesId>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.ManyTypesId>(id)), ((ValueComparer<bool>)(((IProperty)@bool).GetValueComparer())).Snapshot(source.GetCurrentValue<bool>(@bool)), (((IEnumerable<bool>)(source.GetCurrentValue<bool[]>(boolArray))) == null ? null : ((bool[])(((ValueComparer<IEnumerable<bool>>)(((IProperty)boolArray).GetValueComparer())).Snapshot(((IEnumerable<bool>)(source.GetCurrentValue<bool[]>(boolArray))))))), (((IEnumerable<bool>)(source.GetCurrentValue<IReadOnlyCollection<bool>>(boolReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<bool>)(((ValueComparer<IEnumerable<bool>>)(((IProperty)boolReadOnlyCollection).GetValueComparer())).Snapshot(((IEnumerable<bool>)(source.GetCurrentValue<IReadOnlyCollection<bool>>(boolReadOnlyCollection))))))), ((ValueComparer<bool>)(((IProperty)boolToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<bool>(boolToStringConverterProperty)), ((ValueComparer<bool>)(((IProperty)boolToTwoValuesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<bool>(boolToTwoValuesConverterProperty)), ((ValueComparer<bool>)(((IProperty)boolToZeroOneConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<bool>(boolToZeroOneConverterProperty)), (source.GetCurrentValue<byte[]>(bytes) == null ? null : ((ValueComparer<byte[]>)(((IProperty)bytes).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(bytes))), (((object)(source.GetCurrentValue<byte[][]>(bytesArray))) == null ? null : ((byte[][])(((ValueComparer<object>)(((IProperty)bytesArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<byte[][]>(bytesArray))))))), (source.GetCurrentValue<byte[]>(bytesToStringConverterProperty) == null ? null : ((ValueComparer<byte[]>)(((IProperty)bytesToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(bytesToStringConverterProperty))), ((ValueComparer<int>)(((IProperty)castingConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(castingConverterProperty)), ((ValueComparer<char>)(((IProperty)@char).GetValueComparer())).Snapshot(source.GetCurrentValue<char>(@char)), (((IEnumerable<char>)(source.GetCurrentValue<char[]>(charArray))) == null ? null : ((char[])(((ValueComparer<IEnumerable<char>>)(((IProperty)charArray).GetValueComparer())).Snapshot(((IEnumerable<char>)(source.GetCurrentValue<char[]>(charArray))))))), ((ValueComparer<char>)(((IProperty)charToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<char>(charToStringConverterProperty)), ((ValueComparer<DateOnly>)(((IProperty)dateOnly).GetValueComparer())).Snapshot(source.GetCurrentValue<DateOnly>(dateOnly)), (((IEnumerable<DateOnly>)(source.GetCurrentValue<DateOnly[]>(dateOnlyArray))) == null ? null : ((DateOnly[])(((ValueComparer<IEnumerable<DateOnly>>)(((IProperty)dateOnlyArray).GetValueComparer())).Snapshot(((IEnumerable<DateOnly>)(source.GetCurrentValue<DateOnly[]>(dateOnlyArray))))))), ((ValueComparer<DateOnly>)(((IProperty)dateOnlyToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateOnly>(dateOnlyToStringConverterProperty)), ((ValueComparer<DateTime>)(((IProperty)dateTime).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime>(dateTime)), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(dateTimeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)dateTimeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(dateTimeArray))))))), ((ValueComparer<DateTimeOffset>)(((IProperty)dateTimeOffsetToBinaryConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToBinaryConverterProperty)), ((ValueComparer<DateTimeOffset>)(((IProperty)dateTimeOffsetToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToBytesConverterProperty)), ((ValueComparer<DateTimeOffset>)(((IProperty)dateTimeOffsetToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToStringConverterProperty)), ((ValueComparer<DateTime>)(((IProperty)dateTimeToBinaryConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime>(dateTimeToBinaryConverterProperty)), ((ValueComparer<DateTime>)(((IProperty)dateTimeToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime>(dateTimeToStringConverterProperty)), ((ValueComparer<DateTime>)(((IProperty)dateTimeToTicksConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime>(dateTimeToTicksConverterProperty)), ((ValueComparer<decimal>)(((IProperty)@decimal).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal>(@decimal)), (((IEnumerable<decimal>)(source.GetCurrentValue<decimal[]>(decimalArray))) == null ? null : ((decimal[])(((ValueComparer<IEnumerable<decimal>>)(((IProperty)decimalArray).GetValueComparer())).Snapshot(((IEnumerable<decimal>)(source.GetCurrentValue<decimal[]>(decimalArray))))))), ((ValueComparer<decimal>)(((IProperty)decimalNumberToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal>(decimalNumberToBytesConverterProperty)), ((ValueComparer<decimal>)(((IProperty)decimalNumberToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal>(decimalNumberToStringConverterProperty)), ((ValueComparer<double>)(((IProperty)@double).GetValueComparer())).Snapshot(source.GetCurrentValue<double>(@double)))));
+                    var structuralType0 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg0 = ((ISnapshot)(new Snapshot<double[], double, double, CompiledModelTestBase.Enum16, CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16, CompiledModelTestBase.Enum16[], List<CompiledModelTestBase.Enum16>, List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum32, CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32, CompiledModelTestBase.Enum32[], List<CompiledModelTestBase.Enum32>, List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum64, CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64, CompiledModelTestBase.Enum64[], List<CompiledModelTestBase.Enum64>, List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum8, CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8, CompiledModelTestBase.Enum8[], List<CompiledModelTestBase.Enum8>, List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum32, CompiledModelTestBase.Enum32, CompiledModelTestBase.EnumU16>((((IEnumerable<double>)(source.GetCurrentValue<double[]>(doubleArray))) == null ? null : ((double[])(((ValueComparer<IEnumerable<double>>)(((IProperty)doubleArray).GetValueComparer())).Snapshot(((IEnumerable<double>)(source.GetCurrentValue<double[]>(doubleArray))))))), ((ValueComparer<double>)(((IProperty)doubleNumberToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<double>(doubleNumberToBytesConverterProperty)), ((ValueComparer<double>)(((IProperty)doubleNumberToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<double>(doubleNumberToStringConverterProperty)), ((ValueComparer<CompiledModelTestBase.Enum16>)(((IProperty)enum16).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum16>(enum16)), (((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16Array))) == null ? null : ((CompiledModelTestBase.Enum16[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16>>)(((IProperty)enum16Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16Array))))))), ((ValueComparer<CompiledModelTestBase.Enum16>)(((IProperty)enum16AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum16>(enum16AsString)), (((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum16[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16>>)(((IProperty)enum16AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum16>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16>>)(((IProperty)enum16AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16Collection))) == null ? null : ((List<CompiledModelTestBase.Enum16>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16>>)(((IProperty)enum16Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16Collection))))))), ((ValueComparer<CompiledModelTestBase.Enum32>)(((IProperty)enum32).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32>(enum32)), (((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32Array))) == null ? null : ((CompiledModelTestBase.Enum32[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32>>)(((IProperty)enum32Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32Array))))))), ((ValueComparer<CompiledModelTestBase.Enum32>)(((IProperty)enum32AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32>(enum32AsString)), (((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum32[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32>>)(((IProperty)enum32AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum32>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32>>)(((IProperty)enum32AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32Collection))) == null ? null : ((List<CompiledModelTestBase.Enum32>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32>>)(((IProperty)enum32Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32Collection))))))), ((ValueComparer<CompiledModelTestBase.Enum64>)(((IProperty)enum64).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum64>(enum64)), (((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64Array))) == null ? null : ((CompiledModelTestBase.Enum64[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64>>)(((IProperty)enum64Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64Array))))))), ((ValueComparer<CompiledModelTestBase.Enum64>)(((IProperty)enum64AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum64>(enum64AsString)), (((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum64[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64>>)(((IProperty)enum64AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum64>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64>>)(((IProperty)enum64AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64Collection))) == null ? null : ((List<CompiledModelTestBase.Enum64>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64>>)(((IProperty)enum64Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64Collection))))))), ((ValueComparer<CompiledModelTestBase.Enum8>)(((IProperty)enum8).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum8>(enum8)), (((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8Array))) == null ? null : ((CompiledModelTestBase.Enum8[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8>>)(((IProperty)enum8Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8Array))))))), ((ValueComparer<CompiledModelTestBase.Enum8>)(((IProperty)enum8AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum8>(enum8AsString)), (((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum8[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8>>)(((IProperty)enum8AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum8>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8>>)(((IProperty)enum8AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8Collection))) == null ? null : ((List<CompiledModelTestBase.Enum8>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8>>)(((IProperty)enum8Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8Collection))))))), ((ValueComparer<CompiledModelTestBase.Enum32>)(((IProperty)enumToNumberConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32>(enumToNumberConverterProperty)), ((ValueComparer<CompiledModelTestBase.Enum32>)(((IProperty)enumToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32>(enumToStringConverterProperty)), ((ValueComparer<CompiledModelTestBase.EnumU16>)(((IProperty)enumU16).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU16>(enumU16)))));
+                    var structuralType1 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg1 = ((ISnapshot)(new Snapshot<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16, CompiledModelTestBase.EnumU16[], List<CompiledModelTestBase.EnumU16>, List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32[], List<CompiledModelTestBase.EnumU32>, List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU64, CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64, CompiledModelTestBase.EnumU64[], List<CompiledModelTestBase.EnumU64>, List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU8, CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8, CompiledModelTestBase.EnumU8[], List<CompiledModelTestBase.EnumU8>, List<CompiledModelTestBase.EnumU8>, float, float[], Guid, Guid[], Guid, Guid, IPAddress>((((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16Array))) == null ? null : ((CompiledModelTestBase.EnumU16[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16>>)(((IProperty)enumU16Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16Array))))))), ((ValueComparer<CompiledModelTestBase.EnumU16>)(((IProperty)enumU16AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU16>(enumU16AsString)), (((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU16[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16>>)(((IProperty)enumU16AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU16>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16>>)(((IProperty)enumU16AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU16>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16>>)(((IProperty)enumU16Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16Collection))))))), ((ValueComparer<CompiledModelTestBase.EnumU32>)(((IProperty)enumU32).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU32>(enumU32)), (((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32Array))) == null ? null : ((CompiledModelTestBase.EnumU32[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32>>)(((IProperty)enumU32Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32Array))))))), ((ValueComparer<CompiledModelTestBase.EnumU32>)(((IProperty)enumU32AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU32>(enumU32AsString)), (((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU32[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32>>)(((IProperty)enumU32AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU32>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32>>)(((IProperty)enumU32AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU32>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32>>)(((IProperty)enumU32Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32Collection))))))), ((ValueComparer<CompiledModelTestBase.EnumU64>)(((IProperty)enumU64).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU64>(enumU64)), (((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64Array))) == null ? null : ((CompiledModelTestBase.EnumU64[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64>>)(((IProperty)enumU64Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64Array))))))), ((ValueComparer<CompiledModelTestBase.EnumU64>)(((IProperty)enumU64AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU64>(enumU64AsString)), (((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU64[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64>>)(((IProperty)enumU64AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU64>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64>>)(((IProperty)enumU64AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU64>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64>>)(((IProperty)enumU64Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64Collection))))))), ((ValueComparer<CompiledModelTestBase.EnumU8>)(((IProperty)enumU8).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU8>(enumU8)), (((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8Array))) == null ? null : ((CompiledModelTestBase.EnumU8[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8>>)(((IProperty)enumU8Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8Array))))))), ((ValueComparer<CompiledModelTestBase.EnumU8>)(((IProperty)enumU8AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU8>(enumU8AsString)), (((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU8[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8>>)(((IProperty)enumU8AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU8>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8>>)(((IProperty)enumU8AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU8>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8>>)(((IProperty)enumU8Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8Collection))))))), ((ValueComparer<float>)(((IProperty)@float).GetValueComparer())).Snapshot(source.GetCurrentValue<float>(@float)), (((IEnumerable<float>)(source.GetCurrentValue<float[]>(floatArray))) == null ? null : ((float[])(((ValueComparer<IEnumerable<float>>)(((IProperty)floatArray).GetValueComparer())).Snapshot(((IEnumerable<float>)(source.GetCurrentValue<float[]>(floatArray))))))), ((ValueComparer<Guid>)(((IProperty)guid).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(guid)), (((IEnumerable<Guid>)(source.GetCurrentValue<Guid[]>(guidArray))) == null ? null : ((Guid[])(((ValueComparer<IEnumerable<Guid>>)(((IProperty)guidArray).GetValueComparer())).Snapshot(((IEnumerable<Guid>)(source.GetCurrentValue<Guid[]>(guidArray))))))), ((ValueComparer<Guid>)(((IProperty)guidToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(guidToBytesConverterProperty)), ((ValueComparer<Guid>)(((IProperty)guidToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(guidToStringConverterProperty)), (source.GetCurrentValue<IPAddress>(iPAddress) == null ? null : ((ValueComparer<IPAddress>)(((IProperty)iPAddress).GetValueComparer())).Snapshot(source.GetCurrentValue<IPAddress>(iPAddress))))));
+                    var structuralType2 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg2 = ((ISnapshot)(new Snapshot<IPAddress[], IReadOnlyCollection<IPAddress>, IPAddress, IPAddress, short, short[], int, int[], IReadOnlyCollection<int>, long, long[], sbyte, sbyte[], int, int, int?, bool?, bool? [], byte[], byte[][], char?, char? [], DateOnly?, DateOnly? [], DateTime?, DateTime? [], decimal?, decimal? [], double?, double? []>((((object)(source.GetCurrentValue<IPAddress[]>(iPAddressArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)iPAddressArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(iPAddressArray))))))), (((object)(source.GetCurrentValue<IReadOnlyCollection<IPAddress>>(iPAddressReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<IPAddress>)(((ValueComparer<object>)(((IProperty)iPAddressReadOnlyCollection).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IReadOnlyCollection<IPAddress>>(iPAddressReadOnlyCollection))))))), (source.GetCurrentValue<IPAddress>(iPAddressToBytesConverterProperty) == null ? null : ((ValueComparer<IPAddress>)(((IProperty)iPAddressToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<IPAddress>(iPAddressToBytesConverterProperty))), (source.GetCurrentValue<IPAddress>(iPAddressToStringConverterProperty) == null ? null : ((ValueComparer<IPAddress>)(((IProperty)iPAddressToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<IPAddress>(iPAddressToStringConverterProperty))), ((ValueComparer<short>)(((IProperty)int16).GetValueComparer())).Snapshot(source.GetCurrentValue<short>(int16)), (((IEnumerable<short>)(source.GetCurrentValue<short[]>(int16Array))) == null ? null : ((short[])(((ValueComparer<IEnumerable<short>>)(((IProperty)int16Array).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<short[]>(int16Array))))))), ((ValueComparer<int>)(((IProperty)int32).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(int32)), (((IEnumerable<int>)(source.GetCurrentValue<int[]>(int32Array))) == null ? null : ((int[])(((ValueComparer<IEnumerable<int>>)(((IProperty)int32Array).GetValueComparer())).Snapshot(((IEnumerable<int>)(source.GetCurrentValue<int[]>(int32Array))))))), (((IEnumerable<int>)(source.GetCurrentValue<IReadOnlyCollection<int>>(int32ReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<int>)(((ValueComparer<IEnumerable<int>>)(((IProperty)int32ReadOnlyCollection).GetValueComparer())).Snapshot(((IEnumerable<int>)(source.GetCurrentValue<IReadOnlyCollection<int>>(int32ReadOnlyCollection))))))), ((ValueComparer<long>)(((IProperty)int64).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(int64)), (((IEnumerable<long>)(source.GetCurrentValue<long[]>(int64Array))) == null ? null : ((long[])(((ValueComparer<IEnumerable<long>>)(((IProperty)int64Array).GetValueComparer())).Snapshot(((IEnumerable<long>)(source.GetCurrentValue<long[]>(int64Array))))))), ((ValueComparer<sbyte>)(((IProperty)int8).GetValueComparer())).Snapshot(source.GetCurrentValue<sbyte>(int8)), (((IEnumerable<sbyte>)(source.GetCurrentValue<sbyte[]>(int8Array))) == null ? null : ((sbyte[])(((ValueComparer<IEnumerable<sbyte>>)(((IProperty)int8Array).GetValueComparer())).Snapshot(((IEnumerable<sbyte>)(source.GetCurrentValue<sbyte[]>(int8Array))))))), ((ValueComparer<int>)(((IProperty)intNumberToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(intNumberToBytesConverterProperty)), ((ValueComparer<int>)(((IProperty)intNumberToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(intNumberToStringConverterProperty)), (source.GetCurrentValue<int?>(nullIntToNullStringConverterProperty) == null ? null : ((ValueComparer<int?>)(((IProperty)nullIntToNullStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<int?>(nullIntToNullStringConverterProperty))), (source.GetCurrentValue<bool?>(nullableBool) == null ? null : ((ValueComparer<bool?>)(((IProperty)nullableBool).GetValueComparer())).Snapshot(source.GetCurrentValue<bool?>(nullableBool))), (((IEnumerable<bool?>)(source.GetCurrentValue<bool? []>(nullableBoolArray))) == null ? null : ((bool? [])(((ValueComparer<IEnumerable<bool?>>)(((IProperty)nullableBoolArray).GetValueComparer())).Snapshot(((IEnumerable<bool?>)(source.GetCurrentValue<bool? []>(nullableBoolArray))))))), (source.GetCurrentValue<byte[]>(nullableBytes) == null ? null : ((ValueComparer<byte[]>)(((IProperty)nullableBytes).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(nullableBytes))), (((object)(source.GetCurrentValue<byte[][]>(nullableBytesArray))) == null ? null : ((byte[][])(((ValueComparer<object>)(((IProperty)nullableBytesArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<byte[][]>(nullableBytesArray))))))), (source.GetCurrentValue<char?>(nullableChar) == null ? null : ((ValueComparer<char?>)(((IProperty)nullableChar).GetValueComparer())).Snapshot(source.GetCurrentValue<char?>(nullableChar))), (((IEnumerable<char?>)(source.GetCurrentValue<char? []>(nullableCharArray))) == null ? null : ((char? [])(((ValueComparer<IEnumerable<char?>>)(((IProperty)nullableCharArray).GetValueComparer())).Snapshot(((IEnumerable<char?>)(source.GetCurrentValue<char? []>(nullableCharArray))))))), (source.GetCurrentValue<DateOnly?>(nullableDateOnly) == null ? null : ((ValueComparer<DateOnly?>)(((IProperty)nullableDateOnly).GetValueComparer())).Snapshot(source.GetCurrentValue<DateOnly?>(nullableDateOnly))), (((IEnumerable<DateOnly?>)(source.GetCurrentValue<DateOnly? []>(nullableDateOnlyArray))) == null ? null : ((DateOnly? [])(((ValueComparer<IEnumerable<DateOnly?>>)(((IProperty)nullableDateOnlyArray).GetValueComparer())).Snapshot(((IEnumerable<DateOnly?>)(source.GetCurrentValue<DateOnly? []>(nullableDateOnlyArray))))))), (source.GetCurrentValue<DateTime?>(nullableDateTime) == null ? null : ((ValueComparer<DateTime?>)(((IProperty)nullableDateTime).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime?>(nullableDateTime))), (((IEnumerable<DateTime?>)(source.GetCurrentValue<DateTime? []>(nullableDateTimeArray))) == null ? null : ((DateTime? [])(((ValueComparer<IEnumerable<DateTime?>>)(((IProperty)nullableDateTimeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime?>)(source.GetCurrentValue<DateTime? []>(nullableDateTimeArray))))))), (source.GetCurrentValue<decimal?>(nullableDecimal) == null ? null : ((ValueComparer<decimal?>)(((IProperty)nullableDecimal).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal?>(nullableDecimal))), (((IEnumerable<decimal?>)(source.GetCurrentValue<decimal? []>(nullableDecimalArray))) == null ? null : ((decimal? [])(((ValueComparer<IEnumerable<decimal?>>)(((IProperty)nullableDecimalArray).GetValueComparer())).Snapshot(((IEnumerable<decimal?>)(source.GetCurrentValue<decimal? []>(nullableDecimalArray))))))), (source.GetCurrentValue<double?>(nullableDouble) == null ? null : ((ValueComparer<double?>)(((IProperty)nullableDouble).GetValueComparer())).Snapshot(source.GetCurrentValue<double?>(nullableDouble))), (((IEnumerable<double?>)(source.GetCurrentValue<double? []>(nullableDoubleArray))) == null ? null : ((double? [])(((ValueComparer<IEnumerable<double?>>)(((IProperty)nullableDoubleArray).GetValueComparer())).Snapshot(((IEnumerable<double?>)(source.GetCurrentValue<double? []>(nullableDoubleArray))))))))));
+                    var structuralType3 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg3 = ((ISnapshot)(new Snapshot<CompiledModelTestBase.Enum16?, CompiledModelTestBase.Enum16? [], CompiledModelTestBase.Enum16?, CompiledModelTestBase.Enum16? [], List<CompiledModelTestBase.Enum16?>, List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum32?, CompiledModelTestBase.Enum32? [], CompiledModelTestBase.Enum32?, CompiledModelTestBase.Enum32? [], List<CompiledModelTestBase.Enum32?>, List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum64?, CompiledModelTestBase.Enum64? [], CompiledModelTestBase.Enum64?, CompiledModelTestBase.Enum64? [], List<CompiledModelTestBase.Enum64?>, List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum8?, CompiledModelTestBase.Enum8? [], CompiledModelTestBase.Enum8?, CompiledModelTestBase.Enum8? [], List<CompiledModelTestBase.Enum8?>, List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.EnumU16?, CompiledModelTestBase.EnumU16? [], CompiledModelTestBase.EnumU16?, CompiledModelTestBase.EnumU16? [], List<CompiledModelTestBase.EnumU16?>, List<CompiledModelTestBase.EnumU16?>>((source.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum16?>)(((IProperty)nullableEnum16).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16))), (((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16Array))) == null ? null : ((CompiledModelTestBase.Enum16? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16?>>)(((IProperty)nullableEnum16Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16Array))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum16?>)(((IProperty)nullableEnum16AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16AsString))), (((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum16? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16?>>)(((IProperty)nullableEnum16AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum16?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16?>>)(((IProperty)nullableEnum16AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16Collection))) == null ? null : ((List<CompiledModelTestBase.Enum16?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16?>>)(((IProperty)nullableEnum16Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum32?>)(((IProperty)nullableEnum32).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32))), (((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32Array))) == null ? null : ((CompiledModelTestBase.Enum32? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32?>>)(((IProperty)nullableEnum32Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32Array))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum32?>)(((IProperty)nullableEnum32AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32AsString))), (((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum32? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32?>>)(((IProperty)nullableEnum32AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum32?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32?>>)(((IProperty)nullableEnum32AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32Collection))) == null ? null : ((List<CompiledModelTestBase.Enum32?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32?>>)(((IProperty)nullableEnum32Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum64?>)(((IProperty)nullableEnum64).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64))), (((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64Array))) == null ? null : ((CompiledModelTestBase.Enum64? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64?>>)(((IProperty)nullableEnum64Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64Array))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum64?>)(((IProperty)nullableEnum64AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64AsString))), (((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum64? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64?>>)(((IProperty)nullableEnum64AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum64?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64?>>)(((IProperty)nullableEnum64AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64Collection))) == null ? null : ((List<CompiledModelTestBase.Enum64?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64?>>)(((IProperty)nullableEnum64Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum8?>)(((IProperty)nullableEnum8).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8))), (((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8Array))) == null ? null : ((CompiledModelTestBase.Enum8? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8?>>)(((IProperty)nullableEnum8Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8Array))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum8?>)(((IProperty)nullableEnum8AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8AsString))), (((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum8? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8?>>)(((IProperty)nullableEnum8AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum8?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8?>>)(((IProperty)nullableEnum8AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8Collection))) == null ? null : ((List<CompiledModelTestBase.Enum8?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8?>>)(((IProperty)nullableEnum8Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU16?>)(((IProperty)nullableEnumU16).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16))), (((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16Array))) == null ? null : ((CompiledModelTestBase.EnumU16? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16?>>)(((IProperty)nullableEnumU16Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16Array))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU16?>)(((IProperty)nullableEnumU16AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16AsString))), (((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU16? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16?>>)(((IProperty)nullableEnumU16AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU16?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16?>>)(((IProperty)nullableEnumU16AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU16?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16?>>)(((IProperty)nullableEnumU16Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16Collection))))))))));
+                    var structuralType4 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg4 = ((ISnapshot)(new Snapshot<CompiledModelTestBase.EnumU32?, CompiledModelTestBase.EnumU32? [], CompiledModelTestBase.EnumU32?, CompiledModelTestBase.EnumU32? [], List<CompiledModelTestBase.EnumU32?>, List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU64?, CompiledModelTestBase.EnumU64? [], CompiledModelTestBase.EnumU64?, CompiledModelTestBase.EnumU64? [], List<CompiledModelTestBase.EnumU64?>, List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU8?, CompiledModelTestBase.EnumU8? [], CompiledModelTestBase.EnumU8?, CompiledModelTestBase.EnumU8? [], List<CompiledModelTestBase.EnumU8?>, List<CompiledModelTestBase.EnumU8?>, float?, float? [], Guid?, Guid? [], IPAddress, IPAddress[], short?, short? [], int?, int? [], long?, long? []>((source.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU32?>)(((IProperty)nullableEnumU32).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32))), (((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32Array))) == null ? null : ((CompiledModelTestBase.EnumU32? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32?>>)(((IProperty)nullableEnumU32Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32Array))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU32?>)(((IProperty)nullableEnumU32AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32AsString))), (((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU32? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32?>>)(((IProperty)nullableEnumU32AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU32?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32?>>)(((IProperty)nullableEnumU32AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU32?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32?>>)(((IProperty)nullableEnumU32Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU64?>)(((IProperty)nullableEnumU64).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64))), (((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64Array))) == null ? null : ((CompiledModelTestBase.EnumU64? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64?>>)(((IProperty)nullableEnumU64Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64Array))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU64?>)(((IProperty)nullableEnumU64AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64AsString))), (((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU64? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64?>>)(((IProperty)nullableEnumU64AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU64?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64?>>)(((IProperty)nullableEnumU64AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU64?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64?>>)(((IProperty)nullableEnumU64Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU8?>)(((IProperty)nullableEnumU8).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8))), (((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8Array))) == null ? null : ((CompiledModelTestBase.EnumU8? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8?>>)(((IProperty)nullableEnumU8Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8Array))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU8?>)(((IProperty)nullableEnumU8AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8AsString))), (((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU8? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8?>>)(((IProperty)nullableEnumU8AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU8?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8?>>)(((IProperty)nullableEnumU8AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU8?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8?>>)(((IProperty)nullableEnumU8Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8Collection))))))), (source.GetCurrentValue<float?>(nullableFloat) == null ? null : ((ValueComparer<float?>)(((IProperty)nullableFloat).GetValueComparer())).Snapshot(source.GetCurrentValue<float?>(nullableFloat))), (((IEnumerable<float?>)(source.GetCurrentValue<float? []>(nullableFloatArray))) == null ? null : ((float? [])(((ValueComparer<IEnumerable<float?>>)(((IProperty)nullableFloatArray).GetValueComparer())).Snapshot(((IEnumerable<float?>)(source.GetCurrentValue<float? []>(nullableFloatArray))))))), (source.GetCurrentValue<Guid?>(nullableGuid) == null ? null : ((ValueComparer<Guid?>)(((IProperty)nullableGuid).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid?>(nullableGuid))), (((IEnumerable<Guid?>)(source.GetCurrentValue<Guid? []>(nullableGuidArray))) == null ? null : ((Guid? [])(((ValueComparer<IEnumerable<Guid?>>)(((IProperty)nullableGuidArray).GetValueComparer())).Snapshot(((IEnumerable<Guid?>)(source.GetCurrentValue<Guid? []>(nullableGuidArray))))))), (source.GetCurrentValue<IPAddress>(nullableIPAddress) == null ? null : ((ValueComparer<IPAddress>)(((IProperty)nullableIPAddress).GetValueComparer())).Snapshot(source.GetCurrentValue<IPAddress>(nullableIPAddress))), (((object)(source.GetCurrentValue<IPAddress[]>(nullableIPAddressArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)nullableIPAddressArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(nullableIPAddressArray))))))), (source.GetCurrentValue<short?>(nullableInt16) == null ? null : ((ValueComparer<short?>)(((IProperty)nullableInt16).GetValueComparer())).Snapshot(source.GetCurrentValue<short?>(nullableInt16))), (((IEnumerable<short?>)(source.GetCurrentValue<short? []>(nullableInt16Array))) == null ? null : ((short? [])(((ValueComparer<IEnumerable<short?>>)(((IProperty)nullableInt16Array).GetValueComparer())).Snapshot(((IEnumerable<short?>)(source.GetCurrentValue<short? []>(nullableInt16Array))))))), (source.GetCurrentValue<int?>(nullableInt32) == null ? null : ((ValueComparer<int?>)(((IProperty)nullableInt32).GetValueComparer())).Snapshot(source.GetCurrentValue<int?>(nullableInt32))), (((IEnumerable<int?>)(source.GetCurrentValue<int? []>(nullableInt32Array))) == null ? null : ((int? [])(((ValueComparer<IEnumerable<int?>>)(((IProperty)nullableInt32Array).GetValueComparer())).Snapshot(((IEnumerable<int?>)(source.GetCurrentValue<int? []>(nullableInt32Array))))))), (source.GetCurrentValue<long?>(nullableInt64) == null ? null : ((ValueComparer<long?>)(((IProperty)nullableInt64).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(nullableInt64))), (((IEnumerable<long?>)(source.GetCurrentValue<long? []>(nullableInt64Array))) == null ? null : ((long? [])(((ValueComparer<IEnumerable<long?>>)(((IProperty)nullableInt64Array).GetValueComparer())).Snapshot(((IEnumerable<long?>)(source.GetCurrentValue<long? []>(nullableInt64Array))))))))));
+                    var structuralType5 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg5 = ((ISnapshot)(new Snapshot<sbyte?, sbyte? [], PhysicalAddress, PhysicalAddress[], string, string[], TimeOnly?, TimeOnly? [], TimeSpan?, TimeSpan? [], ushort?, ushort? [], uint?, uint? [], ulong?, ulong? [], byte?, byte? [], Uri, Uri[], PhysicalAddress, PhysicalAddress[], PhysicalAddress, PhysicalAddress, string, string[], IReadOnlyCollection<string>, string, string, string>((source.GetCurrentValue<sbyte?>(nullableInt8) == null ? null : ((ValueComparer<sbyte?>)(((IProperty)nullableInt8).GetValueComparer())).Snapshot(source.GetCurrentValue<sbyte?>(nullableInt8))), (((IEnumerable<sbyte?>)(source.GetCurrentValue<sbyte? []>(nullableInt8Array))) == null ? null : ((sbyte? [])(((ValueComparer<IEnumerable<sbyte?>>)(((IProperty)nullableInt8Array).GetValueComparer())).Snapshot(((IEnumerable<sbyte?>)(source.GetCurrentValue<sbyte? []>(nullableInt8Array))))))), (source.GetCurrentValue<PhysicalAddress>(nullablePhysicalAddress) == null ? null : ((ValueComparer<PhysicalAddress>)(((IProperty)nullablePhysicalAddress).GetValueComparer())).Snapshot(source.GetCurrentValue<PhysicalAddress>(nullablePhysicalAddress))), (((object)(source.GetCurrentValue<PhysicalAddress[]>(nullablePhysicalAddressArray))) == null ? null : ((PhysicalAddress[])(((ValueComparer<object>)(((IProperty)nullablePhysicalAddressArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<PhysicalAddress[]>(nullablePhysicalAddressArray))))))), (source.GetCurrentValue<string>(nullableString) == null ? null : ((ValueComparer<string>)(((IProperty)nullableString).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(nullableString))), (((object)(source.GetCurrentValue<string[]>(nullableStringArray))) == null ? null : ((string[])(((ValueComparer<object>)(((IProperty)nullableStringArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<string[]>(nullableStringArray))))))), (source.GetCurrentValue<TimeOnly?>(nullableTimeOnly) == null ? null : ((ValueComparer<TimeOnly?>)(((IProperty)nullableTimeOnly).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeOnly?>(nullableTimeOnly))), (((IEnumerable<TimeOnly?>)(source.GetCurrentValue<TimeOnly? []>(nullableTimeOnlyArray))) == null ? null : ((TimeOnly? [])(((ValueComparer<IEnumerable<TimeOnly?>>)(((IProperty)nullableTimeOnlyArray).GetValueComparer())).Snapshot(((IEnumerable<TimeOnly?>)(source.GetCurrentValue<TimeOnly? []>(nullableTimeOnlyArray))))))), (source.GetCurrentValue<TimeSpan?>(nullableTimeSpan) == null ? null : ((ValueComparer<TimeSpan?>)(((IProperty)nullableTimeSpan).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeSpan?>(nullableTimeSpan))), (((IEnumerable<TimeSpan?>)(source.GetCurrentValue<TimeSpan? []>(nullableTimeSpanArray))) == null ? null : ((TimeSpan? [])(((ValueComparer<IEnumerable<TimeSpan?>>)(((IProperty)nullableTimeSpanArray).GetValueComparer())).Snapshot(((IEnumerable<TimeSpan?>)(source.GetCurrentValue<TimeSpan? []>(nullableTimeSpanArray))))))), (source.GetCurrentValue<ushort?>(nullableUInt16) == null ? null : ((ValueComparer<ushort?>)(((IProperty)nullableUInt16).GetValueComparer())).Snapshot(source.GetCurrentValue<ushort?>(nullableUInt16))), (((IEnumerable<ushort?>)(source.GetCurrentValue<ushort? []>(nullableUInt16Array))) == null ? null : ((ushort? [])(((ValueComparer<IEnumerable<ushort?>>)(((IProperty)nullableUInt16Array).GetValueComparer())).Snapshot(((IEnumerable<ushort?>)(source.GetCurrentValue<ushort? []>(nullableUInt16Array))))))), (source.GetCurrentValue<uint?>(nullableUInt32) == null ? null : ((ValueComparer<uint?>)(((IProperty)nullableUInt32).GetValueComparer())).Snapshot(source.GetCurrentValue<uint?>(nullableUInt32))), (((IEnumerable<uint?>)(source.GetCurrentValue<uint? []>(nullableUInt32Array))) == null ? null : ((uint? [])(((ValueComparer<IEnumerable<uint?>>)(((IProperty)nullableUInt32Array).GetValueComparer())).Snapshot(((IEnumerable<uint?>)(source.GetCurrentValue<uint? []>(nullableUInt32Array))))))), (source.GetCurrentValue<ulong?>(nullableUInt64) == null ? null : ((ValueComparer<ulong?>)(((IProperty)nullableUInt64).GetValueComparer())).Snapshot(source.GetCurrentValue<ulong?>(nullableUInt64))), (((IEnumerable<ulong?>)(source.GetCurrentValue<ulong? []>(nullableUInt64Array))) == null ? null : ((ulong? [])(((ValueComparer<IEnumerable<ulong?>>)(((IProperty)nullableUInt64Array).GetValueComparer())).Snapshot(((IEnumerable<ulong?>)(source.GetCurrentValue<ulong? []>(nullableUInt64Array))))))), (source.GetCurrentValue<byte?>(nullableUInt8) == null ? null : ((ValueComparer<byte?>)(((IProperty)nullableUInt8).GetValueComparer())).Snapshot(source.GetCurrentValue<byte?>(nullableUInt8))), (((IEnumerable<byte?>)(source.GetCurrentValue<byte? []>(nullableUInt8Array))) == null ? null : ((byte? [])(((ValueComparer<IEnumerable<byte?>>)(((IProperty)nullableUInt8Array).GetValueComparer())).Snapshot(((IEnumerable<byte?>)(source.GetCurrentValue<byte? []>(nullableUInt8Array))))))), (source.GetCurrentValue<Uri>(nullableUri) == null ? null : ((ValueComparer<Uri>)(((IProperty)nullableUri).GetValueComparer())).Snapshot(source.GetCurrentValue<Uri>(nullableUri))), (((object)(source.GetCurrentValue<Uri[]>(nullableUriArray))) == null ? null : ((Uri[])(((ValueComparer<object>)(((IProperty)nullableUriArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<Uri[]>(nullableUriArray))))))), (source.GetCurrentValue<PhysicalAddress>(physicalAddress) == null ? null : ((ValueComparer<PhysicalAddress>)(((IProperty)physicalAddress).GetValueComparer())).Snapshot(source.GetCurrentValue<PhysicalAddress>(physicalAddress))), (((object)(source.GetCurrentValue<PhysicalAddress[]>(physicalAddressArray))) == null ? null : ((PhysicalAddress[])(((ValueComparer<object>)(((IProperty)physicalAddressArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<PhysicalAddress[]>(physicalAddressArray))))))), (source.GetCurrentValue<PhysicalAddress>(physicalAddressToBytesConverterProperty) == null ? null : ((ValueComparer<PhysicalAddress>)(((IProperty)physicalAddressToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<PhysicalAddress>(physicalAddressToBytesConverterProperty))), (source.GetCurrentValue<PhysicalAddress>(physicalAddressToStringConverterProperty) == null ? null : ((ValueComparer<PhysicalAddress>)(((IProperty)physicalAddressToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<PhysicalAddress>(physicalAddressToStringConverterProperty))), (source.GetCurrentValue<string>(@string) == null ? null : ((ValueComparer<string>)(((IProperty)@string).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(@string))), (((object)(source.GetCurrentValue<string[]>(stringArray))) == null ? null : ((string[])(((ValueComparer<object>)(((IProperty)stringArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<string[]>(stringArray))))))), (((object)(source.GetCurrentValue<IReadOnlyCollection<string>>(stringReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<string>)(((ValueComparer<object>)(((IProperty)stringReadOnlyCollection).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IReadOnlyCollection<string>>(stringReadOnlyCollection))))))), (source.GetCurrentValue<string>(stringToBoolConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToBoolConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToBoolConverterProperty))), (source.GetCurrentValue<string>(stringToBytesConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToBytesConverterProperty))), (source.GetCurrentValue<string>(stringToCharConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToCharConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToCharConverterProperty))))));
+                    var structuralType6 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg6 = ((ISnapshot)(new Snapshot<string, string, string, string, string, string, string, string, string, string, string, TimeOnly, TimeOnly[], TimeOnly, TimeOnly, TimeSpan, TimeSpan[], TimeSpan, TimeSpan, ushort, ushort[], uint, uint[], ulong, ulong[], byte, byte[], IReadOnlyCollection<byte>, Uri, Uri[]>((source.GetCurrentValue<string>(stringToDateOnlyConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDateOnlyConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDateOnlyConverterProperty))), (source.GetCurrentValue<string>(stringToDateTimeConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDateTimeConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDateTimeConverterProperty))), (source.GetCurrentValue<string>(stringToDateTimeOffsetConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDateTimeOffsetConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDateTimeOffsetConverterProperty))), (source.GetCurrentValue<string>(stringToDecimalNumberConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDecimalNumberConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDecimalNumberConverterProperty))), (source.GetCurrentValue<string>(stringToDoubleNumberConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDoubleNumberConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDoubleNumberConverterProperty))), (source.GetCurrentValue<string>(stringToEnumConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToEnumConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToEnumConverterProperty))), (source.GetCurrentValue<string>(stringToGuidConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToGuidConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToGuidConverterProperty))), (source.GetCurrentValue<string>(stringToIntNumberConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToIntNumberConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToIntNumberConverterProperty))), (source.GetCurrentValue<string>(stringToTimeOnlyConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToTimeOnlyConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToTimeOnlyConverterProperty))), (source.GetCurrentValue<string>(stringToTimeSpanConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToTimeSpanConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToTimeSpanConverterProperty))), (source.GetCurrentValue<string>(stringToUriConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToUriConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToUriConverterProperty))), ((ValueComparer<TimeOnly>)(((IProperty)timeOnly).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeOnly>(timeOnly)), (((IEnumerable<TimeOnly>)(source.GetCurrentValue<TimeOnly[]>(timeOnlyArray))) == null ? null : ((TimeOnly[])(((ValueComparer<IEnumerable<TimeOnly>>)(((IProperty)timeOnlyArray).GetValueComparer())).Snapshot(((IEnumerable<TimeOnly>)(source.GetCurrentValue<TimeOnly[]>(timeOnlyArray))))))), ((ValueComparer<TimeOnly>)(((IProperty)timeOnlyToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeOnly>(timeOnlyToStringConverterProperty)), ((ValueComparer<TimeOnly>)(((IProperty)timeOnlyToTicksConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeOnly>(timeOnlyToTicksConverterProperty)), ((ValueComparer<TimeSpan>)(((IProperty)timeSpan).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeSpan>(timeSpan)), (((IEnumerable<TimeSpan>)(source.GetCurrentValue<TimeSpan[]>(timeSpanArray))) == null ? null : ((TimeSpan[])(((ValueComparer<IEnumerable<TimeSpan>>)(((IProperty)timeSpanArray).GetValueComparer())).Snapshot(((IEnumerable<TimeSpan>)(source.GetCurrentValue<TimeSpan[]>(timeSpanArray))))))), ((ValueComparer<TimeSpan>)(((IProperty)timeSpanToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeSpan>(timeSpanToStringConverterProperty)), ((ValueComparer<TimeSpan>)(((IProperty)timeSpanToTicksConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeSpan>(timeSpanToTicksConverterProperty)), ((ValueComparer<ushort>)(((IProperty)uInt16).GetValueComparer())).Snapshot(source.GetCurrentValue<ushort>(uInt16)), (((IEnumerable<ushort>)(source.GetCurrentValue<ushort[]>(uInt16Array))) == null ? null : ((ushort[])(((ValueComparer<IEnumerable<ushort>>)(((IProperty)uInt16Array).GetValueComparer())).Snapshot(((IEnumerable<ushort>)(source.GetCurrentValue<ushort[]>(uInt16Array))))))), ((ValueComparer<uint>)(((IProperty)uInt32).GetValueComparer())).Snapshot(source.GetCurrentValue<uint>(uInt32)), (((IEnumerable<uint>)(source.GetCurrentValue<uint[]>(uInt32Array))) == null ? null : ((uint[])(((ValueComparer<IEnumerable<uint>>)(((IProperty)uInt32Array).GetValueComparer())).Snapshot(((IEnumerable<uint>)(source.GetCurrentValue<uint[]>(uInt32Array))))))), ((ValueComparer<ulong>)(((IProperty)uInt64).GetValueComparer())).Snapshot(source.GetCurrentValue<ulong>(uInt64)), (((IEnumerable<ulong>)(source.GetCurrentValue<ulong[]>(uInt64Array))) == null ? null : ((ulong[])(((ValueComparer<IEnumerable<ulong>>)(((IProperty)uInt64Array).GetValueComparer())).Snapshot(((IEnumerable<ulong>)(source.GetCurrentValue<ulong[]>(uInt64Array))))))), ((ValueComparer<byte>)(((IProperty)uInt8).GetValueComparer())).Snapshot(source.GetCurrentValue<byte>(uInt8)), (source.GetCurrentValue<byte[]>(uInt8Array) == null ? null : ((ValueComparer<byte[]>)(((IProperty)uInt8Array).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(uInt8Array))), (((IEnumerable<byte>)(source.GetCurrentValue<IReadOnlyCollection<byte>>(uInt8ReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)uInt8ReadOnlyCollection).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IReadOnlyCollection<byte>>(uInt8ReadOnlyCollection))))))), (source.GetCurrentValue<Uri>(uri) == null ? null : ((ValueComparer<Uri>)(((IProperty)uri).GetValueComparer())).Snapshot(source.GetCurrentValue<Uri>(uri))), (((object)(source.GetCurrentValue<Uri[]>(uriArray))) == null ? null : ((Uri[])(((ValueComparer<object>)(((IProperty)uriArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<Uri[]>(uriArray))))))))));
+                    var structuralType7 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    return ((ISnapshot)(new MultiSnapshot(new ISnapshot[] { liftedArg, liftedArg0, liftedArg1, liftedArg2, liftedArg3, liftedArg4, liftedArg5, liftedArg6, ((ISnapshot)(new Snapshot<Uri>((source.GetCurrentValue<Uri>(uriToStringConverterProperty) == null ? null : ((ValueComparer<Uri>)(((IProperty)uriToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<Uri>(uriToStringConverterProperty)))))) })));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<CompiledModelTestBase.ManyTypesId>(((ValueComparer<CompiledModelTestBase.ManyTypesId>)(((IProperty)id).GetValueComparer())).Snapshot(default(CompiledModelTestBase.ManyTypesId))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<CompiledModelTestBase.ManyTypesId>(default(CompiledModelTestBase.ManyTypesId)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => Snapshot.Empty);
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<CompiledModelTestBase.ManyTypesId>(((ValueComparer<CompiledModelTestBase.ManyTypesId>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.ManyTypesId>(id)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 241,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 241,
+                shadowCount: 0,
+                relationshipCount: 1,
+                storeGeneratedCount: 1));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "ManyTypes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesUnsafeAccessors.cs
new file mode 100644
index 00000000..48de8dc1
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesUnsafeAccessors.cs
@@ -0,0 +1,739 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class ManyTypesUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref CompiledModelTestBase.ManyTypesId Id(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Bool>k__BackingField")]
+        public static extern ref bool Bool(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BoolArray>k__BackingField")]
+        public static extern ref bool[] BoolArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_boolReadOnlyCollection")]
+        public static extern ref List<bool> _boolReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BoolToStringConverterProperty>k__BackingField")]
+        public static extern ref bool BoolToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BoolToTwoValuesConverterProperty>k__BackingField")]
+        public static extern ref bool BoolToTwoValuesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BoolToZeroOneConverterProperty>k__BackingField")]
+        public static extern ref bool BoolToZeroOneConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Bytes>k__BackingField")]
+        public static extern ref byte[] Bytes(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BytesArray>k__BackingField")]
+        public static extern ref byte[][] BytesArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BytesToStringConverterProperty>k__BackingField")]
+        public static extern ref byte[] BytesToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<CastingConverterProperty>k__BackingField")]
+        public static extern ref int CastingConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Char>k__BackingField")]
+        public static extern ref char Char(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<CharArray>k__BackingField")]
+        public static extern ref char[] CharArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<CharToStringConverterProperty>k__BackingField")]
+        public static extern ref char CharToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateOnly>k__BackingField")]
+        public static extern ref DateOnly DateOnly(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateOnlyArray>k__BackingField")]
+        public static extern ref DateOnly[] DateOnlyArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateOnlyToStringConverterProperty>k__BackingField")]
+        public static extern ref DateOnly DateOnlyToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTime>k__BackingField")]
+        public static extern ref DateTime DateTime(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeArray>k__BackingField")]
+        public static extern ref DateTime[] DateTimeArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeOffsetToBinaryConverterProperty>k__BackingField")]
+        public static extern ref DateTimeOffset DateTimeOffsetToBinaryConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeOffsetToBytesConverterProperty>k__BackingField")]
+        public static extern ref DateTimeOffset DateTimeOffsetToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeOffsetToStringConverterProperty>k__BackingField")]
+        public static extern ref DateTimeOffset DateTimeOffsetToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeToBinaryConverterProperty>k__BackingField")]
+        public static extern ref DateTime DateTimeToBinaryConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeToStringConverterProperty>k__BackingField")]
+        public static extern ref DateTime DateTimeToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeToTicksConverterProperty>k__BackingField")]
+        public static extern ref DateTime DateTimeToTicksConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Decimal>k__BackingField")]
+        public static extern ref decimal Decimal(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DecimalArray>k__BackingField")]
+        public static extern ref decimal[] DecimalArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DecimalNumberToBytesConverterProperty>k__BackingField")]
+        public static extern ref decimal DecimalNumberToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DecimalNumberToStringConverterProperty>k__BackingField")]
+        public static extern ref decimal DecimalNumberToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Double>k__BackingField")]
+        public static extern ref double Double(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DoubleArray>k__BackingField")]
+        public static extern ref double[] DoubleArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DoubleNumberToBytesConverterProperty>k__BackingField")]
+        public static extern ref double DoubleNumberToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DoubleNumberToStringConverterProperty>k__BackingField")]
+        public static extern ref double DoubleNumberToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16 Enum16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16[] Enum16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16 Enum16AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16[] Enum16AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum16> Enum16AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum16> Enum16Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32 Enum32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32[] Enum32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32 Enum32AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32[] Enum32AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum32> Enum32AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum32> Enum32Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64 Enum64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64[] Enum64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64 Enum64AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64[] Enum64AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum64> Enum64AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum64> Enum64Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8 Enum8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8[] Enum8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8 Enum8AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8[] Enum8AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum8> Enum8AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum8> Enum8Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumToNumberConverterProperty>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32 EnumToNumberConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumToStringConverterProperty>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32 EnumToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16 EnumU16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16[] EnumU16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16 EnumU16AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16[] EnumU16AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU16> EnumU16AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU16> EnumU16Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32 EnumU32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32[] EnumU32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32 EnumU32AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32[] EnumU32AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU32> EnumU32AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU32> EnumU32Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64 EnumU64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64[] EnumU64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64 EnumU64AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64[] EnumU64AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU64> EnumU64AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU64> EnumU64Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8 EnumU8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8[] EnumU8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8 EnumU8AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8[] EnumU8AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU8> EnumU8AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU8> EnumU8Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Float>k__BackingField")]
+        public static extern ref float Float(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<FloatArray>k__BackingField")]
+        public static extern ref float[] FloatArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Guid>k__BackingField")]
+        public static extern ref Guid Guid(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<GuidArray>k__BackingField")]
+        public static extern ref Guid[] GuidArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<GuidToBytesConverterProperty>k__BackingField")]
+        public static extern ref Guid GuidToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<GuidToStringConverterProperty>k__BackingField")]
+        public static extern ref Guid GuidToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IPAddress>k__BackingField")]
+        public static extern ref IPAddress IPAddress(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IPAddressArray>k__BackingField")]
+        public static extern ref IPAddress[] IPAddressArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_ipAddressReadOnlyCollection")]
+        public static extern ref List<IPAddress> _ipAddressReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IPAddressToBytesConverterProperty>k__BackingField")]
+        public static extern ref IPAddress IPAddressToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IPAddressToStringConverterProperty>k__BackingField")]
+        public static extern ref IPAddress IPAddressToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int16>k__BackingField")]
+        public static extern ref short Int16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int16Array>k__BackingField")]
+        public static extern ref short[] Int16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int32>k__BackingField")]
+        public static extern ref int Int32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int32Array>k__BackingField")]
+        public static extern ref int[] Int32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_int32ReadOnlyCollection")]
+        public static extern ref List<int> _int32ReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int64>k__BackingField")]
+        public static extern ref long Int64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int64Array>k__BackingField")]
+        public static extern ref long[] Int64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int8>k__BackingField")]
+        public static extern ref sbyte Int8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int8Array>k__BackingField")]
+        public static extern ref sbyte[] Int8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IntNumberToBytesConverterProperty>k__BackingField")]
+        public static extern ref int IntNumberToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IntNumberToStringConverterProperty>k__BackingField")]
+        public static extern ref int IntNumberToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullIntToNullStringConverterProperty>k__BackingField")]
+        public static extern ref int? NullIntToNullStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableBool>k__BackingField")]
+        public static extern ref bool? NullableBool(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableBoolArray>k__BackingField")]
+        public static extern ref bool?[] NullableBoolArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableBytes>k__BackingField")]
+        public static extern ref byte[] NullableBytes(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableBytesArray>k__BackingField")]
+        public static extern ref byte[][] NullableBytesArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableChar>k__BackingField")]
+        public static extern ref char? NullableChar(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableCharArray>k__BackingField")]
+        public static extern ref char?[] NullableCharArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDateOnly>k__BackingField")]
+        public static extern ref DateOnly? NullableDateOnly(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDateOnlyArray>k__BackingField")]
+        public static extern ref DateOnly?[] NullableDateOnlyArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDateTime>k__BackingField")]
+        public static extern ref DateTime? NullableDateTime(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDateTimeArray>k__BackingField")]
+        public static extern ref DateTime?[] NullableDateTimeArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDecimal>k__BackingField")]
+        public static extern ref decimal? NullableDecimal(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDecimalArray>k__BackingField")]
+        public static extern ref decimal?[] NullableDecimalArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDouble>k__BackingField")]
+        public static extern ref double? NullableDouble(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDoubleArray>k__BackingField")]
+        public static extern ref double?[] NullableDoubleArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16? NullableEnum16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16?[] NullableEnum16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16? NullableEnum16AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16?[] NullableEnum16AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum16?> NullableEnum16AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum16?> NullableEnum16Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32? NullableEnum32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32?[] NullableEnum32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32? NullableEnum32AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32?[] NullableEnum32AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum32?> NullableEnum32AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum32?> NullableEnum32Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64? NullableEnum64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64?[] NullableEnum64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64? NullableEnum64AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64?[] NullableEnum64AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum64?> NullableEnum64AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum64?> NullableEnum64Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8? NullableEnum8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8?[] NullableEnum8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8? NullableEnum8AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8?[] NullableEnum8AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum8?> NullableEnum8AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum8?> NullableEnum8Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16? NullableEnumU16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16?[] NullableEnumU16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16? NullableEnumU16AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16?[] NullableEnumU16AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU16?> NullableEnumU16AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU16?> NullableEnumU16Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32? NullableEnumU32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32?[] NullableEnumU32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32? NullableEnumU32AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32?[] NullableEnumU32AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU32?> NullableEnumU32AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU32?> NullableEnumU32Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64? NullableEnumU64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64?[] NullableEnumU64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64? NullableEnumU64AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64?[] NullableEnumU64AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU64?> NullableEnumU64AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU64?> NullableEnumU64Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8? NullableEnumU8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8?[] NullableEnumU8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8? NullableEnumU8AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8?[] NullableEnumU8AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU8?> NullableEnumU8AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU8?> NullableEnumU8Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableFloat>k__BackingField")]
+        public static extern ref float? NullableFloat(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableFloatArray>k__BackingField")]
+        public static extern ref float?[] NullableFloatArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableGuid>k__BackingField")]
+        public static extern ref Guid? NullableGuid(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableGuidArray>k__BackingField")]
+        public static extern ref Guid?[] NullableGuidArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableIPAddress>k__BackingField")]
+        public static extern ref IPAddress NullableIPAddress(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableIPAddressArray>k__BackingField")]
+        public static extern ref IPAddress[] NullableIPAddressArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt16>k__BackingField")]
+        public static extern ref short? NullableInt16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt16Array>k__BackingField")]
+        public static extern ref short?[] NullableInt16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt32>k__BackingField")]
+        public static extern ref int? NullableInt32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt32Array>k__BackingField")]
+        public static extern ref int?[] NullableInt32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt64>k__BackingField")]
+        public static extern ref long? NullableInt64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt64Array>k__BackingField")]
+        public static extern ref long?[] NullableInt64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt8>k__BackingField")]
+        public static extern ref sbyte? NullableInt8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt8Array>k__BackingField")]
+        public static extern ref sbyte?[] NullableInt8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullablePhysicalAddress>k__BackingField")]
+        public static extern ref PhysicalAddress NullablePhysicalAddress(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullablePhysicalAddressArray>k__BackingField")]
+        public static extern ref PhysicalAddress[] NullablePhysicalAddressArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableString>k__BackingField")]
+        public static extern ref string NullableString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableStringArray>k__BackingField")]
+        public static extern ref string[] NullableStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableTimeOnly>k__BackingField")]
+        public static extern ref TimeOnly? NullableTimeOnly(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableTimeOnlyArray>k__BackingField")]
+        public static extern ref TimeOnly?[] NullableTimeOnlyArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableTimeSpan>k__BackingField")]
+        public static extern ref TimeSpan? NullableTimeSpan(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableTimeSpanArray>k__BackingField")]
+        public static extern ref TimeSpan?[] NullableTimeSpanArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt16>k__BackingField")]
+        public static extern ref ushort? NullableUInt16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt16Array>k__BackingField")]
+        public static extern ref ushort?[] NullableUInt16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt32>k__BackingField")]
+        public static extern ref uint? NullableUInt32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt32Array>k__BackingField")]
+        public static extern ref uint?[] NullableUInt32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt64>k__BackingField")]
+        public static extern ref ulong? NullableUInt64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt64Array>k__BackingField")]
+        public static extern ref ulong?[] NullableUInt64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt8>k__BackingField")]
+        public static extern ref byte? NullableUInt8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt8Array>k__BackingField")]
+        public static extern ref byte?[] NullableUInt8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUri>k__BackingField")]
+        public static extern ref Uri NullableUri(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUriArray>k__BackingField")]
+        public static extern ref Uri[] NullableUriArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<PhysicalAddress>k__BackingField")]
+        public static extern ref PhysicalAddress PhysicalAddress(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<PhysicalAddressArray>k__BackingField")]
+        public static extern ref PhysicalAddress[] PhysicalAddressArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<PhysicalAddressToBytesConverterProperty>k__BackingField")]
+        public static extern ref PhysicalAddress PhysicalAddressToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<PhysicalAddressToStringConverterProperty>k__BackingField")]
+        public static extern ref PhysicalAddress PhysicalAddressToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<String>k__BackingField")]
+        public static extern ref string String(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringArray>k__BackingField")]
+        public static extern ref string[] StringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_stringReadOnlyCollection")]
+        public static extern ref List<string> _stringReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToBoolConverterProperty>k__BackingField")]
+        public static extern ref string StringToBoolConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToBytesConverterProperty>k__BackingField")]
+        public static extern ref string StringToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToCharConverterProperty>k__BackingField")]
+        public static extern ref string StringToCharConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDateOnlyConverterProperty>k__BackingField")]
+        public static extern ref string StringToDateOnlyConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDateTimeConverterProperty>k__BackingField")]
+        public static extern ref string StringToDateTimeConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDateTimeOffsetConverterProperty>k__BackingField")]
+        public static extern ref string StringToDateTimeOffsetConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDecimalNumberConverterProperty>k__BackingField")]
+        public static extern ref string StringToDecimalNumberConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDoubleNumberConverterProperty>k__BackingField")]
+        public static extern ref string StringToDoubleNumberConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToEnumConverterProperty>k__BackingField")]
+        public static extern ref string StringToEnumConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToGuidConverterProperty>k__BackingField")]
+        public static extern ref string StringToGuidConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToIntNumberConverterProperty>k__BackingField")]
+        public static extern ref string StringToIntNumberConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToTimeOnlyConverterProperty>k__BackingField")]
+        public static extern ref string StringToTimeOnlyConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToTimeSpanConverterProperty>k__BackingField")]
+        public static extern ref string StringToTimeSpanConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToUriConverterProperty>k__BackingField")]
+        public static extern ref string StringToUriConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeOnly>k__BackingField")]
+        public static extern ref TimeOnly TimeOnly(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeOnlyArray>k__BackingField")]
+        public static extern ref TimeOnly[] TimeOnlyArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeOnlyToStringConverterProperty>k__BackingField")]
+        public static extern ref TimeOnly TimeOnlyToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeOnlyToTicksConverterProperty>k__BackingField")]
+        public static extern ref TimeOnly TimeOnlyToTicksConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeSpan>k__BackingField")]
+        public static extern ref TimeSpan TimeSpan(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeSpanArray>k__BackingField")]
+        public static extern ref TimeSpan[] TimeSpanArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeSpanToStringConverterProperty>k__BackingField")]
+        public static extern ref TimeSpan TimeSpanToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeSpanToTicksConverterProperty>k__BackingField")]
+        public static extern ref TimeSpan TimeSpanToTicksConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt16>k__BackingField")]
+        public static extern ref ushort UInt16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt16Array>k__BackingField")]
+        public static extern ref ushort[] UInt16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt32>k__BackingField")]
+        public static extern ref uint UInt32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt32Array>k__BackingField")]
+        public static extern ref uint[] UInt32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt64>k__BackingField")]
+        public static extern ref ulong UInt64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt64Array>k__BackingField")]
+        public static extern ref ulong[] UInt64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt8>k__BackingField")]
+        public static extern ref byte UInt8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt8Array>k__BackingField")]
+        public static extern ref byte[] UInt8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_uInt8ReadOnlyCollection")]
+        public static extern ref List<byte> _uInt8ReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Uri>k__BackingField")]
+        public static extern ref Uri Uri(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UriArray>k__BackingField")]
+        public static extern ref Uri[] UriArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UriToStringConverterProperty>k__BackingField")]
+        public static extern ref Uri UriToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs
new file mode 100644
index 00000000..bc926ca9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs
@@ -0,0 +1,954 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class OwnedType0EntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType",
+                typeof(CompiledModelTestBase.OwnedType),
+                baseEntityType,
+                sharedClrType: true,
+                propertyCount: 13,
+                servicePropertyCount: 1,
+                foreignKeyCount: 1,
+                keyCount: 1);
+
+            var principalDerivedId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedId",
+                typeof(long),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+            principalDerivedId.SetAccessors(
+                long (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<long>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<long>(0) == 0L ? entry.ReadTemporaryValue<long>(0) : entry.ReadShadowValue<long>(0))),
+                long (IInternalEntry entry) => entry.ReadShadowValue<long>(0),
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(principalDerivedId, 0),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(principalDerivedId, 0));
+            principalDerivedId.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: 0,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            principalDerivedId.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<long, int>(
+                    int (long v) => ((int)v),
+                    long (int v) => ((long)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<long, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<long, int>(
+                        int (long v) => ((int)v),
+                        long (int v) => ((long)v))));
+            principalDerivedId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(principalDerivedId));
+            principalDerivedId.SetSentinelFromProviderValue(0);
+
+            var principalDerivedAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedAlternateId",
+                typeof(Guid),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            principalDerivedAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<Guid>(1) : (entry.FlaggedAsTemporary(1) && entry.ReadShadowValue<Guid>(1) == new Guid("00000000-0000-0000-0000-000000000000") ? entry.ReadTemporaryValue<Guid>(1) : entry.ReadShadowValue<Guid>(1))),
+                Guid (IInternalEntry entry) => entry.ReadShadowValue<Guid>(1),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(principalDerivedAlternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(principalDerivedAlternateId, 1));
+            principalDerivedAlternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: 1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            principalDerivedAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            principalDerivedAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(principalDerivedAlternateId));
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.SetAccessors(
+                int (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(2) ? entry.ReadStoreGeneratedValue<int>(2) : (entry.FlaggedAsTemporary(2) && entry.ReadShadowValue<int>(2) == 0 ? entry.ReadTemporaryValue<int>(2) : entry.ReadShadowValue<int>(2))),
+                int (IInternalEntry entry) => entry.ReadShadowValue<int>(2),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(id, 2),
+                int (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<int>(id, 2));
+            id.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: 2,
+                relationshipIndex: 2,
+                storeGenerationIndex: 2);
+            id.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<int>(id));
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var details = runtimeEntityType.AddProperty(
+                "Details",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            details.SetGetter(
+                string (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._details(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._details(instance) == null);
+            details.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                {
+                    OwnedTypeUnsafeAccessors._details(instance) = value;
+                    return instance;
+                });
+            details.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                {
+                    OwnedTypeUnsafeAccessors._details(instance) = value;
+                    return instance;
+                });
+            details.SetAccessors(
+                string (IInternalEntry entry) => OwnedTypeUnsafeAccessors._details(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                string (IInternalEntry entry) => OwnedTypeUnsafeAccessors._details(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(details, 3),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(details));
+            details.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            details.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var number = runtimeEntityType.AddProperty(
+                "Number",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0);
+            number.SetGetter(
+                int (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance) == 0);
+            number.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                {
+                    OwnedTypeUnsafeAccessors.Number(instance) = value;
+                    return instance;
+                });
+            number.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                {
+                    OwnedTypeUnsafeAccessors.Number(instance) = value;
+                    return instance;
+                });
+            number.SetAccessors(
+                int (IInternalEntry entry) => OwnedTypeUnsafeAccessors.Number(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                int (IInternalEntry entry) => OwnedTypeUnsafeAccessors.Number(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(number, 4),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(number));
+            number.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            number.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance) == null);
+            refTypeArray.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 5),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+            refTypeArray.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+            refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.SetGetter(
+                IEnumerable<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) == null);
+            refTypeEnumerable.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetAccessors(
+                IEnumerable<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 6),
+                IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+            refTypeEnumerable.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+            refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.SetGetter(
+                IList<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance) == null);
+            refTypeIList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetAccessors(
+                IList<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 7),
+                IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+            refTypeIList.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+            refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.SetGetter(
+                List<IPAddress> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance) == null);
+            refTypeList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetAccessors(
+                List<IPAddress> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 8),
+                List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+            refTypeList.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+            refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance) == null);
+            valueTypeArray.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 9),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+            valueTypeArray.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+            valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.SetGetter(
+                IEnumerable<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) == null);
+            valueTypeEnumerable.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetAccessors(
+                IEnumerable<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 10),
+                IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+            valueTypeEnumerable.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+            valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.SetGetter(
+                IList<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance) == null);
+            valueTypeIList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetAccessors(
+                IList<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 11),
+                IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+            valueTypeIList.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+            valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.SetGetter(
+                List<short> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance) == null);
+            valueTypeList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetAccessors(
+                List<short> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<short> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 12),
+                List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+            valueTypeList.SetPropertyIndexes(
+                index: 12,
+                originalValueIndex: 12,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+            valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+            var context = runtimeEntityType.AddServiceProperty(
+                "Context",
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Context", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                serviceType: typeof(DbContext));
+            context.SetPropertyIndexes(
+                index: -1,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalDerivedId, principalDerivedAlternateId, id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalDerivedId"), declaringEntityType.FindProperty("PrincipalDerivedAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true,
+                ownership: true);
+
+            var manyOwned = principalEntityType.AddNavigation("ManyOwned",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(IList<CompiledModelTestBase.OwnedType>),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("ManyOwned", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            manyOwned.SetGetter(
+                IList<CompiledModelTestBase.OwnedType> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance),
+                bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance) == null);
+            manyOwned.SetSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, IList<CompiledModelTestBase.OwnedType> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance) = value;
+                    return instance;
+                });
+            manyOwned.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, IList<CompiledModelTestBase.OwnedType> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance) = value;
+                    return instance;
+                });
+            manyOwned.SetAccessors(
+                IList<CompiledModelTestBase.OwnedType> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                IList<CompiledModelTestBase.OwnedType> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                null,
+                IList<CompiledModelTestBase.OwnedType> (IInternalEntry entry) => entry.GetCurrentValue<IList<CompiledModelTestBase.OwnedType>>(manyOwned));
+            manyOwned.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 5,
+                storeGenerationIndex: -1);
+            manyOwned.SetCollectionAccessor<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, IList<CompiledModelTestBase.OwnedType>, CompiledModelTestBase.OwnedType>(
+                IList<CompiledModelTestBase.OwnedType> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IList<CompiledModelTestBase.OwnedType> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) = ((IList<CompiledModelTestBase.OwnedType>)collection),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IList<CompiledModelTestBase.OwnedType> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) = ((IList<CompiledModelTestBase.OwnedType>)collection),
+                IList<CompiledModelTestBase.OwnedType> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, Action<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, IList<CompiledModelTestBase.OwnedType>> setter) => ClrCollectionAccessorFactory.CreateAndSet<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, IList<CompiledModelTestBase.OwnedType>, List<CompiledModelTestBase.OwnedType>>(entity, setter),
+                IList<CompiledModelTestBase.OwnedType> () => new List<CompiledModelTestBase.OwnedType>());
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var principalDerivedId = runtimeEntityType.FindProperty("PrincipalDerivedId");
+            var principalDerivedAlternateId = runtimeEntityType.FindProperty("PrincipalDerivedAlternateId");
+            var id = runtimeEntityType.FindProperty("Id");
+            var details = runtimeEntityType.FindProperty("Details");
+            var number = runtimeEntityType.FindProperty("Number");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var key = runtimeEntityType.FindKey(new[] { principalDerivedId, principalDerivedAlternateId, id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.OwnedType)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, int, string, int, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>(((ValueComparer<long>)(((IProperty)principalDerivedId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalDerivedId)), ((ValueComparer<Guid>)(((IProperty)principalDerivedAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalDerivedAlternateId)), ((ValueComparer<int>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(id)), (source.GetCurrentValue<string>(details) == null ? null : ((ValueComparer<string>)(((IProperty)details).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(details))), ((ValueComparer<int>)(((IProperty)number).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(number)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, int>(((ValueComparer<long>)(((IProperty)principalDerivedId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalDerivedAlternateId).GetValueComparer())).Snapshot(default(Guid)), ((ValueComparer<int>)(((IProperty)id).GetValueComparer())).Snapshot(default(int))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid, int>(default(long), default(Guid), default(int)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long, Guid, int>((source.ContainsKey("PrincipalDerivedId") ? ((long)(source["PrincipalDerivedId"])) : 0L), (source.ContainsKey("PrincipalDerivedAlternateId") ? ((Guid)(source["PrincipalDerivedAlternateId"])) : new Guid("00000000-0000-0000-0000-000000000000")), (source.ContainsKey("Id") ? ((int)(source["Id"])) : 0)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, int>(default(long), default(Guid), default(int)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.OwnedType)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, int>(((ValueComparer<long>)(((IProperty)principalDerivedId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalDerivedId)), ((ValueComparer<Guid>)(((IProperty)principalDerivedAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalDerivedAlternateId)), ((ValueComparer<int>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<int>(id)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 13,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 13,
+                shadowCount: 3,
+                relationshipCount: 3,
+                storeGeneratedCount: 3));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "ManyOwned");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs
new file mode 100644
index 00000000..f9dd193e
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs
@@ -0,0 +1,976 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class OwnedTypeEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                typeof(CompiledModelTestBase.OwnedType),
+                baseEntityType,
+                sharedClrType: true,
+                changeTrackingStrategy: ChangeTrackingStrategy.ChangingAndChangedNotificationsWithOriginalValues,
+                propertyCount: 12,
+                servicePropertyCount: 1,
+                foreignKeyCount: 2,
+                keyCount: 1);
+
+            var principalBaseId = runtimeEntityType.AddProperty(
+                "PrincipalBaseId",
+                typeof(long),
+                propertyAccessMode: PropertyAccessMode.Field,
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+            principalBaseId.SetAccessors(
+                long (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<long>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<long>(0) == 0L ? entry.ReadTemporaryValue<long>(0) : entry.ReadShadowValue<long>(0))),
+                long (IInternalEntry entry) => entry.ReadShadowValue<long>(0),
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(principalBaseId, 0),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(principalBaseId, 0));
+            principalBaseId.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: 0,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            principalBaseId.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<long, int>(
+                    int (long v) => ((int)v),
+                    long (int v) => ((long)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<long, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<long, int>(
+                        int (long v) => ((int)v),
+                        long (int v) => ((long)v))));
+            principalBaseId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(principalBaseId));
+            principalBaseId.SetSentinelFromProviderValue(0);
+
+            var overrides = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var principalBaseIdPrincipalBase = new RuntimeRelationalPropertyOverrides(
+                principalBaseId,
+                StoreObjectIdentifier.Table("PrincipalBase", "mySchema"),
+                false,
+                null);
+            principalBaseIdPrincipalBase.AddAnnotation("Jet:IdentityIncrement", 3);
+            principalBaseIdPrincipalBase.AddAnnotation("Jet:IdentitySeed", 2);
+            principalBaseIdPrincipalBase.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            overrides.Add(StoreObjectIdentifier.Table("PrincipalBase", "mySchema"), principalBaseIdPrincipalBase);
+            principalBaseId.AddAnnotation("Relational:RelationalOverrides", overrides);
+
+            principalBaseId.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var principalBaseAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalBaseAlternateId",
+                typeof(Guid),
+                propertyAccessMode: PropertyAccessMode.Field,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            principalBaseAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<Guid>(1) : (entry.FlaggedAsTemporary(1) && entry.ReadShadowValue<Guid>(1) == new Guid("00000000-0000-0000-0000-000000000000") ? entry.ReadTemporaryValue<Guid>(1) : entry.ReadShadowValue<Guid>(1))),
+                Guid (IInternalEntry entry) => entry.ReadShadowValue<Guid>(1),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(principalBaseAlternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(principalBaseAlternateId, 1));
+            principalBaseAlternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: 1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            principalBaseAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            principalBaseAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(principalBaseAlternateId));
+
+            var details = runtimeEntityType.AddProperty(
+                "Details",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            details.SetGetter(
+                string (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._details(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._details(instance) == null);
+            details.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                {
+                    OwnedTypeUnsafeAccessors._details(instance) = value;
+                    return instance;
+                });
+            details.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                {
+                    OwnedTypeUnsafeAccessors._details(instance) = value;
+                    return instance;
+                });
+            details.SetAccessors(
+                string (IInternalEntry entry) => OwnedTypeUnsafeAccessors._details(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                string (IInternalEntry entry) => OwnedTypeUnsafeAccessors._details(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(details, 2),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(details));
+            details.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            details.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var overrides0 = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var detailsDetails = new RuntimeRelationalPropertyOverrides(
+                details,
+                StoreObjectIdentifier.Table("Details", null),
+                false,
+                null);
+            overrides0.Add(StoreObjectIdentifier.Table("Details", null), detailsDetails);
+            details.AddAnnotation("Relational:RelationalOverrides", overrides0);
+
+
+            var number = runtimeEntityType.AddProperty(
+                "Number",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                sentinel: 0);
+            number.SetGetter(
+                int (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance) == 0);
+            number.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                {
+                    OwnedTypeUnsafeAccessors.Number(instance) = value;
+                    return instance;
+                });
+            number.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                {
+                    OwnedTypeUnsafeAccessors.Number(instance) = value;
+                    return instance;
+                });
+            number.SetAccessors(
+                int (IInternalEntry entry) => OwnedTypeUnsafeAccessors.Number(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                int (IInternalEntry entry) => OwnedTypeUnsafeAccessors.Number(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(number, 3),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(number));
+            number.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            number.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance) == null);
+            refTypeArray.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 4),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+            refTypeArray.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+            refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeEnumerable.SetGetter(
+                IEnumerable<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) == null);
+            refTypeEnumerable.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetAccessors(
+                IEnumerable<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 5),
+                IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+            refTypeEnumerable.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+            refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeIList.SetGetter(
+                IList<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance) == null);
+            refTypeIList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetAccessors(
+                IList<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 6),
+                IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+            refTypeIList.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+            refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeList.SetGetter(
+                List<IPAddress> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance) == null);
+            refTypeList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetAccessors(
+                List<IPAddress> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 7),
+                List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+            refTypeList.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+            refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance) == null);
+            valueTypeArray.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 8),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+            valueTypeArray.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+            valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeEnumerable.SetGetter(
+                IEnumerable<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) == null);
+            valueTypeEnumerable.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetAccessors(
+                IEnumerable<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 9),
+                IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+            valueTypeEnumerable.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+            valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeIList.SetGetter(
+                IList<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance) == null);
+            valueTypeIList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetAccessors(
+                IList<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 10),
+                IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+            valueTypeIList.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+            valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeList.SetGetter(
+                List<short> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance) == null);
+            valueTypeList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetAccessors(
+                List<short> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<short> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 11),
+                List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+            valueTypeList.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+            valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+            var context = runtimeEntityType.AddServiceProperty(
+                "Context",
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Context", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                serviceType: typeof(DbContext));
+            context.SetPropertyIndexes(
+                index: -1,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalBaseId, principalBaseAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId"), declaringEntityType.FindProperty("PrincipalBaseAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                requiredDependent: true,
+                ownership: true);
+
+            var owned = principalEntityType.AddNavigation("Owned",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.OwnedType),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Owned", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("_ownedField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                eagerLoaded: true);
+
+            owned.SetGetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors._ownedField(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors._ownedField(instance) == null);
+            owned.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.OwnedType value) =>
+                {
+                    PrincipalBaseUnsafeAccessors._ownedField(instance) = value;
+                    return instance;
+                });
+            owned.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.OwnedType value) =>
+                {
+                    PrincipalBaseUnsafeAccessors._ownedField(instance) = value;
+                    return instance;
+                });
+            owned.SetAccessors(
+                CompiledModelTestBase.OwnedType (IInternalEntry entry) => PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.OwnedType (IInternalEntry entry) => PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                null,
+                CompiledModelTestBase.OwnedType (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.OwnedType>(owned));
+            owned.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 2,
+                storeGenerationIndex: -1);
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId"), declaringEntityType.FindProperty("PrincipalBaseAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("PrincipalBaseId"), principalEntityType.FindProperty("PrincipalBaseAlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                requiredDependent: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var principalBaseId = runtimeEntityType.FindProperty("PrincipalBaseId");
+            var principalBaseAlternateId = runtimeEntityType.FindProperty("PrincipalBaseAlternateId");
+            var details = runtimeEntityType.FindProperty("Details");
+            var number = runtimeEntityType.FindProperty("Number");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var key = runtimeEntityType.FindKey(new[] { principalBaseId, principalBaseAlternateId });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.OwnedType)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, string, int, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>(((ValueComparer<long>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalBaseId)), ((ValueComparer<Guid>)(((IProperty)principalBaseAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalBaseAlternateId)), (source.GetCurrentValue<string>(details) == null ? null : ((ValueComparer<string>)(((IProperty)details).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(details))), ((ValueComparer<int>)(((IProperty)number).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(number)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid>(((ValueComparer<long>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalBaseAlternateId).GetValueComparer())).Snapshot(default(Guid))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid>(default(long), default(Guid)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long, Guid>((source.ContainsKey("PrincipalBaseId") ? ((long)(source["PrincipalBaseId"])) : 0L), (source.ContainsKey("PrincipalBaseAlternateId") ? ((Guid)(source["PrincipalBaseAlternateId"])) : new Guid("00000000-0000-0000-0000-000000000000"))))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid>(default(long), default(Guid)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.OwnedType)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid>(((ValueComparer<long>)(((IProperty)principalBaseId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalBaseId)), ((ValueComparer<Guid>)(((IProperty)principalBaseAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalBaseAlternateId)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 12,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 12,
+                shadowCount: 2,
+                relationshipCount: 2,
+                storeGeneratedCount: 2));
+            var fragments = new StoreObjectDictionary<RuntimeEntityTypeMappingFragment>();
+            var detailsFragment = new RuntimeEntityTypeMappingFragment(
+                runtimeEntityType,
+                StoreObjectIdentifier.Table("Details", null),
+                null);
+            fragments.Add(StoreObjectIdentifier.Table("Details", null), detailsFragment);
+            runtimeEntityType.AddAnnotation("Relational:MappingFragments", fragments);
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", "mySchema");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeUnsafeAccessors.cs
new file mode 100644
index 00000000..ed8d21e3
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeUnsafeAccessors.cs
@@ -0,0 +1,45 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class OwnedTypeUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_details")]
+        public static extern ref string _details(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Number>k__BackingField")]
+        public static extern ref int Number(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeArray")]
+        public static extern ref IPAddress[] _refTypeArray(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeEnumerable")]
+        public static extern ref IEnumerable<string> _refTypeEnumerable(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeIList")]
+        public static extern ref IList<string> _refTypeIList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeList")]
+        public static extern ref List<IPAddress> _refTypeList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_valueTypeArray")]
+        public static extern ref DateTime[] _valueTypeArray(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_valueTypeEnumerable")]
+        public static extern ref IEnumerable<byte> _valueTypeEnumerable(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeIList>k__BackingField")]
+        public static extern ref IList<byte> ValueTypeIList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_valueTypeList")]
+        public static extern ref List<short> _valueTypeList(CompiledModelTestBase.OwnedType @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs
new file mode 100644
index 00000000..18c025c1
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs
@@ -0,0 +1,1106 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                typeof(CompiledModelTestBase.PrincipalBase),
+                baseEntityType,
+                discriminatorValue: "PrincipalBase",
+                derivedTypesCount: 1,
+                propertyCount: 14,
+                navigationCount: 1,
+                skipNavigationCount: 1,
+                unnamedIndexCount: 1,
+                keyCount: 2);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+            id.SetGetter(
+                long? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Id(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Id(instance).HasValue));
+            id.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                long? (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<long?>(0) : (entry.FlaggedAsTemporary(0) && !(PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))).HasValue) ? entry.ReadTemporaryValue<long?>(0) : PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                long? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(id, 0),
+                long? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long?>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            id.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<long, int>(
+                    int (long v) => ((int)v),
+                    long (int v) => ((long)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<long, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<long, int>(
+                        int (long v) => ((int)v),
+                        long (int v) => ((long)v))));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<long?>(id));
+            id.SetComparer(new NullableValueComparer<long>(id.TypeMapping.Comparer));
+            id.SetKeyComparer(new NullableValueComparer<long>(id.TypeMapping.KeyComparer));
+
+            var overrides = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var idPrincipalDerived = new RuntimeRelationalPropertyOverrides(
+                id,
+                StoreObjectIdentifier.Table("PrincipalDerived", null),
+                true,
+                "DerivedId");
+            overrides.Add(StoreObjectIdentifier.Table("PrincipalDerived", null), idPrincipalDerived);
+            id.AddAnnotation("Relational:RelationalOverrides", overrides);
+
+            id.AddAnnotation("Jet:IdentityIncrement", 3);
+            id.AddAnnotation("Jet:IdentitySeed", 2);
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var alternateId = runtimeEntityType.AddProperty(
+                "AlternateId",
+                typeof(Guid),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("AlternateId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.FieldDuringConstruction,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"),
+                jsonValueReaderWriter: JsonGuidReaderWriter.Instance);
+            alternateId.SetGetter(
+                Guid (CompiledModelTestBase.PrincipalBase instance) => instance.AlternateId,
+                bool (CompiledModelTestBase.PrincipalBase instance) => instance.AlternateId == new Guid("00000000-0000-0000-0000-000000000000"));
+            alternateId.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, Guid value) =>
+                {
+                    instance.AlternateId = value;
+                    return instance;
+                });
+            alternateId.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, Guid value) =>
+                {
+                    instance.AlternateId = value;
+                    return instance;
+                });
+            alternateId.SetAccessors(
+                Guid (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<Guid>(1) : (entry.FlaggedAsTemporary(1) && ((CompiledModelTestBase.PrincipalBase)(entry.Entity)).AlternateId == new Guid("00000000-0000-0000-0000-000000000000") ? entry.ReadTemporaryValue<Guid>(1) : ((CompiledModelTestBase.PrincipalBase)(entry.Entity)).AlternateId)),
+                Guid (IInternalEntry entry) => ((CompiledModelTestBase.PrincipalBase)(entry.Entity)).AlternateId,
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(alternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(alternateId, 1));
+            alternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            alternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            alternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(alternateId));
+
+            var enum1 = runtimeEntityType.AddProperty(
+                "Enum1",
+                typeof(CompiledModelTestBase.AnEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum1.SetGetter(
+                CompiledModelTestBase.AnEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum1(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.Enum1(instance))), ((object)((CompiledModelTestBase.AnEnum)0L))));
+            enum1.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                    return instance;
+                });
+            enum1.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                    return instance;
+                });
+            enum1.SetAccessors(
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum>(enum1, 2),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1));
+            enum1.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                    CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                        CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+            enum1.SetSentinelFromProviderValue(0);
+
+            var enum2 = runtimeEntityType.AddProperty(
+                "Enum2",
+                typeof(CompiledModelTestBase.AnEnum?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            enum2.SetGetter(
+                CompiledModelTestBase.AnEnum? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum2(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Enum2(instance).HasValue));
+            enum2.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                    return instance;
+                });
+            enum2.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                    return instance;
+                });
+            enum2.SetAccessors(
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum?>(enum2, 3),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2));
+            enum2.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                    CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                        CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+            enum2.SetComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.Comparer));
+            enum2.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.KeyComparer));
+
+            var flagsEnum1 = runtimeEntityType.AddProperty(
+                "FlagsEnum1",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum1.SetGetter(
+                CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum1(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum1(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+            flagsEnum1.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                    return instance;
+                });
+            flagsEnum1.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                    return instance;
+                });
+            flagsEnum1.SetAccessors(
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1, 4),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1));
+            flagsEnum1.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            flagsEnum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                    CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                        CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+            flagsEnum1.SetSentinelFromProviderValue(0);
+
+            var flagsEnum2 = runtimeEntityType.AddProperty(
+                "FlagsEnum2",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Property);
+            flagsEnum2.SetGetter(
+                CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Get_FlagsEnum2(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.Get_FlagsEnum2(instance))), ((object)(CompiledModelTestBase.AFlagsEnum.B | CompiledModelTestBase.AFlagsEnum.C))));
+            flagsEnum2.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Set_FlagsEnum2(instance, value);
+                    return instance;
+                });
+            flagsEnum2.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Set_FlagsEnum2(instance, value);
+                    return instance;
+                });
+            flagsEnum2.SetAccessors(
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Get_FlagsEnum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Get_FlagsEnum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2, 5),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2));
+            flagsEnum2.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            flagsEnum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                    CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                        CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+            flagsEnum2.SetSentinelFromProviderValue(6);
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance) == null);
+            refTypeArray.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 6),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+            refTypeArray.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+            refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.SetGetter(
+                IEnumerable<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) == null);
+            refTypeEnumerable.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetAccessors(
+                IEnumerable<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 7),
+                IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+            refTypeEnumerable.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+            refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.SetGetter(
+                IList<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance) == null);
+            refTypeIList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetAccessors(
+                IList<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 8),
+                IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+            refTypeIList.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+            refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.SetGetter(
+                List<IPAddress> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance) == null);
+            refTypeList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetAccessors(
+                List<IPAddress> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 9),
+                List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+            refTypeList.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+            refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) == null);
+            valueTypeArray.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 10),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+            valueTypeArray.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+            valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.SetGetter(
+                IEnumerable<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) == null);
+            valueTypeEnumerable.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetAccessors(
+                IEnumerable<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 11),
+                IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+            valueTypeEnumerable.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+            valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.SetGetter(
+                IList<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) == null);
+            valueTypeIList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetAccessors(
+                IList<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 12),
+                IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+            valueTypeIList.SetPropertyIndexes(
+                index: 12,
+                originalValueIndex: 12,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+            valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.SetGetter(
+                List<short> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance) == null);
+            valueTypeList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetAccessors(
+                List<short> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<short> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 13),
+                List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+            valueTypeList.SetPropertyIndexes(
+                index: 13,
+                originalValueIndex: 13,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+            valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { id, alternateId });
+            runtimeEntityType.SetPrimaryKey(key0);
+            key0.AddAnnotation("Relational:Name", "PK");
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { alternateId, id });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeSkipNavigation CreateSkipNavigation1(RuntimeEntityType declaringEntityType, RuntimeEntityType targetEntityType, RuntimeEntityType joinEntityType)
+        {
+            var skipNavigation = declaringEntityType.AddSkipNavigation(
+                "Deriveds",
+                targetEntityType,
+                joinEntityType.FindForeignKey(
+                    new[] { joinEntityType.FindProperty("PrincipalsId"), joinEntityType.FindProperty("PrincipalsAlternateId") },
+                    declaringEntityType.FindKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") }),
+                    declaringEntityType),
+                true,
+                false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Deriveds", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Deriveds>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var inverse = targetEntityType.FindSkipNavigation("Principals");
+            if (inverse != null)
+            {
+                skipNavigation.Inverse = inverse;
+                inverse.Inverse = skipNavigation;
+            }
+
+            skipNavigation.SetGetter(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Deriveds(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Deriveds(instance) == null);
+            skipNavigation.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Deriveds(instance) = value;
+                    return instance;
+                });
+            skipNavigation.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Deriveds(instance) = value;
+                    return instance;
+                });
+            skipNavigation.SetAccessors(
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Deriveds(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Deriveds(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                null,
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => entry.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(skipNavigation));
+            skipNavigation.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 3,
+                storeGenerationIndex: -1);
+            skipNavigation.SetCollectionAccessor<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase entity) => PrincipalBaseUnsafeAccessors.Deriveds(entity),
+                (CompiledModelTestBase.PrincipalBase entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalBaseUnsafeAccessors.Deriveds(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                (CompiledModelTestBase.PrincipalBase entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalBaseUnsafeAccessors.Deriveds(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase entity, Action<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>> setter) => ClrCollectionAccessorFactory.CreateAndSetHashSet<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(entity, setter),
+                ICollection<CompiledModelTestBase.PrincipalBase> () => ((ICollection<CompiledModelTestBase.PrincipalBase>)(((ICollection<CompiledModelTestBase.PrincipalBase>)(new HashSet<CompiledModelTestBase.PrincipalBase>(ReferenceEqualityComparer.Instance))))));
+            return skipNavigation;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var alternateId = runtimeEntityType.FindProperty("AlternateId");
+            var enum1 = runtimeEntityType.FindProperty("Enum1");
+            var enum2 = runtimeEntityType.FindProperty("Enum2");
+            var flagsEnum1 = runtimeEntityType.FindProperty("FlagsEnum1");
+            var flagsEnum2 = runtimeEntityType.FindProperty("FlagsEnum2");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNullableFactory<long?, long>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<long?>(key));
+            var key0 = runtimeEntityType.FindKey(new[] { id, alternateId });
+            key0.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key0));
+            key0.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key0));
+            var owned = runtimeEntityType.FindNavigation("Owned");
+            var deriveds = runtimeEntityType.FindSkipNavigation("Deriveds");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.PrincipalBase)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, Guid, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum, CompiledModelTestBase.AFlagsEnum, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1)), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long?, Guid>((default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(default(long? ))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetValueComparer())).Snapshot(default(Guid))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long?, Guid>(default(long? ), default(Guid)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => Snapshot.Empty);
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.PrincipalBase)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, Guid, object, object>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), source.GetCurrentValue<CompiledModelTestBase.OwnedType>(owned), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 14,
+                navigationCount: 2,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 14,
+                shadowCount: 0,
+                relationshipCount: 4,
+                storeGeneratedCount: 2));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPT");
+            runtimeEntityType.AddAnnotation("Relational:Schema", "mySchema");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs
new file mode 100644
index 00000000..5f898bb5
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs
@@ -0,0 +1,474 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalBasePrincipalDerivedDependentBasebyteEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                typeof(Dictionary<string, object>),
+                baseEntityType,
+                sharedClrType: true,
+                indexerPropertyInfo: RuntimeEntityType.FindIndexerProperty(typeof(Dictionary<string, object>)),
+                propertyBag: true,
+                propertyCount: 5,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var derivedsId = runtimeEntityType.AddProperty(
+                "DerivedsId",
+                typeof(long),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+            derivedsId.SetGetter(
+                long (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("DerivedsId") ? instance["DerivedsId"] : null) == null ? 0L : ((long)((((IDictionary<string, object>)instance).ContainsKey("DerivedsId") ? instance["DerivedsId"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("DerivedsId") ? instance["DerivedsId"] : null) == null);
+            derivedsId.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
+                {
+                    instance["DerivedsId"] = ((object)value);
+                    return instance;
+                });
+            derivedsId.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
+                {
+                    instance["DerivedsId"] = ((object)value);
+                    return instance;
+                });
+            derivedsId.SetAccessors(
+                long (IInternalEntry entry) =>
+                {
+                    if (entry.FlaggedAsStoreGenerated(0))
+                    {
+                        return entry.ReadStoreGeneratedValue<long>(0);
+                    }
+                    else
+                    {
+                        {
+                            if (entry.FlaggedAsTemporary(0) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsId"] : null) == null)
+                            {
+                                return entry.ReadTemporaryValue<long>(0);
+                            }
+                            else
+                            {
+                                var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsId"] : null);
+                                return (nullableValue == null ? default(long) : ((long)nullableValue));
+                            }
+                        }
+                    }
+                },
+                long (IInternalEntry entry) =>
+                {
+                    var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsId"] : null);
+                    return (nullableValue == null ? default(long) : ((long)nullableValue));
+                },
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(derivedsId, 0),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(derivedsId, 0));
+            derivedsId.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            derivedsId.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<long, int>(
+                    int (long v) => ((int)v),
+                    long (int v) => ((long)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<long, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<long, int>(
+                        int (long v) => ((int)v),
+                        long (int v) => ((long)v))));
+            derivedsId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(derivedsId));
+
+            var derivedsAlternateId = runtimeEntityType.AddProperty(
+                "DerivedsAlternateId",
+                typeof(Guid),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            derivedsAlternateId.SetGetter(
+                Guid (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("DerivedsAlternateId") ? instance["DerivedsAlternateId"] : null) == null ? new Guid("00000000-0000-0000-0000-000000000000") : ((Guid)((((IDictionary<string, object>)instance).ContainsKey("DerivedsAlternateId") ? instance["DerivedsAlternateId"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("DerivedsAlternateId") ? instance["DerivedsAlternateId"] : null) == null);
+            derivedsAlternateId.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
+                {
+                    instance["DerivedsAlternateId"] = ((object)value);
+                    return instance;
+                });
+            derivedsAlternateId.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
+                {
+                    instance["DerivedsAlternateId"] = ((object)value);
+                    return instance;
+                });
+            derivedsAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) =>
+                {
+                    if (entry.FlaggedAsStoreGenerated(1))
+                    {
+                        return entry.ReadStoreGeneratedValue<Guid>(1);
+                    }
+                    else
+                    {
+                        {
+                            if (entry.FlaggedAsTemporary(1) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsAlternateId"] : null) == null)
+                            {
+                                return entry.ReadTemporaryValue<Guid>(1);
+                            }
+                            else
+                            {
+                                var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsAlternateId"] : null);
+                                return (nullableValue == null ? default(Guid) : ((Guid)nullableValue));
+                            }
+                        }
+                    }
+                },
+                Guid (IInternalEntry entry) =>
+                {
+                    var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsAlternateId"] : null);
+                    return (nullableValue == null ? default(Guid) : ((Guid)nullableValue));
+                },
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(derivedsAlternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(derivedsAlternateId, 1));
+            derivedsAlternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            derivedsAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            derivedsAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(derivedsAlternateId));
+
+            var principalsId = runtimeEntityType.AddProperty(
+                "PrincipalsId",
+                typeof(long),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+            principalsId.SetGetter(
+                long (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("PrincipalsId") ? instance["PrincipalsId"] : null) == null ? 0L : ((long)((((IDictionary<string, object>)instance).ContainsKey("PrincipalsId") ? instance["PrincipalsId"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("PrincipalsId") ? instance["PrincipalsId"] : null) == null);
+            principalsId.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
+                {
+                    instance["PrincipalsId"] = ((object)value);
+                    return instance;
+                });
+            principalsId.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
+                {
+                    instance["PrincipalsId"] = ((object)value);
+                    return instance;
+                });
+            principalsId.SetAccessors(
+                long (IInternalEntry entry) =>
+                {
+                    if (entry.FlaggedAsStoreGenerated(2))
+                    {
+                        return entry.ReadStoreGeneratedValue<long>(2);
+                    }
+                    else
+                    {
+                        {
+                            if (entry.FlaggedAsTemporary(2) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsId"] : null) == null)
+                            {
+                                return entry.ReadTemporaryValue<long>(2);
+                            }
+                            else
+                            {
+                                var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsId"] : null);
+                                return (nullableValue == null ? default(long) : ((long)nullableValue));
+                            }
+                        }
+                    }
+                },
+                long (IInternalEntry entry) =>
+                {
+                    var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsId"] : null);
+                    return (nullableValue == null ? default(long) : ((long)nullableValue));
+                },
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(principalsId, 2),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(principalsId, 2));
+            principalsId.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: -1,
+                relationshipIndex: 2,
+                storeGenerationIndex: 2);
+            principalsId.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<long, int>(
+                    int (long v) => ((int)v),
+                    long (int v) => ((long)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<long, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<long, int>(
+                        int (long v) => ((int)v),
+                        long (int v) => ((long)v))));
+            principalsId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(principalsId));
+
+            var principalsAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalsAlternateId",
+                typeof(Guid),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            principalsAlternateId.SetGetter(
+                Guid (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("PrincipalsAlternateId") ? instance["PrincipalsAlternateId"] : null) == null ? new Guid("00000000-0000-0000-0000-000000000000") : ((Guid)((((IDictionary<string, object>)instance).ContainsKey("PrincipalsAlternateId") ? instance["PrincipalsAlternateId"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("PrincipalsAlternateId") ? instance["PrincipalsAlternateId"] : null) == null);
+            principalsAlternateId.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
+                {
+                    instance["PrincipalsAlternateId"] = ((object)value);
+                    return instance;
+                });
+            principalsAlternateId.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
+                {
+                    instance["PrincipalsAlternateId"] = ((object)value);
+                    return instance;
+                });
+            principalsAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) =>
+                {
+                    if (entry.FlaggedAsStoreGenerated(3))
+                    {
+                        return entry.ReadStoreGeneratedValue<Guid>(3);
+                    }
+                    else
+                    {
+                        {
+                            if (entry.FlaggedAsTemporary(3) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsAlternateId"] : null) == null)
+                            {
+                                return entry.ReadTemporaryValue<Guid>(3);
+                            }
+                            else
+                            {
+                                var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsAlternateId"] : null);
+                                return (nullableValue == null ? default(Guid) : ((Guid)nullableValue));
+                            }
+                        }
+                    }
+                },
+                Guid (IInternalEntry entry) =>
+                {
+                    var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsAlternateId"] : null);
+                    return (nullableValue == null ? default(Guid) : ((Guid)nullableValue));
+                },
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(principalsAlternateId, 3),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(principalsAlternateId, 3));
+            principalsAlternateId.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: 3,
+                storeGenerationIndex: 3);
+            principalsAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            principalsAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(principalsAlternateId));
+
+            var rowid = runtimeEntityType.AddProperty(
+                "rowid",
+                typeof(byte[]),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                nullable: true,
+                concurrencyToken: true,
+                valueGenerated: ValueGenerated.OnAddOrUpdate,
+                beforeSaveBehavior: PropertySaveBehavior.Ignore,
+                afterSaveBehavior: PropertySaveBehavior.Ignore);
+            rowid.SetGetter(
+                byte[] (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("rowid") ? instance["rowid"] : null) == null ? null : ((byte[])((((IDictionary<string, object>)instance).ContainsKey("rowid") ? instance["rowid"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("rowid") ? instance["rowid"] : null) == null);
+            rowid.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, byte[] value) =>
+                {
+                    instance["rowid"] = ((object)value);
+                    return instance;
+                });
+            rowid.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, byte[] value) =>
+                {
+                    instance["rowid"] = ((object)value);
+                    return instance;
+                });
+            rowid.SetAccessors(
+                byte[] (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(4) ? entry.ReadStoreGeneratedValue<byte[]>(4) : (entry.FlaggedAsTemporary(4) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("rowid") ? ((Dictionary<string, object>)(entry.Entity))["rowid"] : null) == null ? entry.ReadTemporaryValue<byte[]>(4) : ((byte[])((((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("rowid") ? ((Dictionary<string, object>)(entry.Entity))["rowid"] : null))))),
+                byte[] (IInternalEntry entry) => ((byte[])((((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("rowid") ? ((Dictionary<string, object>)(entry.Entity))["rowid"] : null))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(rowid, 4),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(rowid));
+            rowid.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: 4);
+            rowid.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(v1, v2),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(v),
+                    byte[] (byte[] v) => v.ToArray()),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(8)",
+                    size: 8));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { derivedsId, derivedsAlternateId, principalsId, principalsAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalsId, principalsAlternateId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DerivedsId"), declaringEntityType.FindProperty("DerivedsAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalsId"), declaringEntityType.FindProperty("PrincipalsAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.ClientCascade,
+                required: true);
+
+            runtimeForeignKey.AddAnnotation("Relational:Name", "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Princip~1");
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var derivedsId = runtimeEntityType.FindProperty("DerivedsId");
+            var derivedsAlternateId = runtimeEntityType.FindProperty("DerivedsAlternateId");
+            var principalsId = runtimeEntityType.FindProperty("PrincipalsId");
+            var principalsAlternateId = runtimeEntityType.FindProperty("PrincipalsAlternateId");
+            var rowid = runtimeEntityType.FindProperty("rowid");
+            var key = runtimeEntityType.FindKey(new[] { derivedsId, derivedsAlternateId, principalsId, principalsAlternateId });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((Dictionary<string, object>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, long, Guid, byte[]>(((ValueComparer<long>)(((IProperty)derivedsId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(derivedsId)), ((ValueComparer<Guid>)(((IProperty)derivedsAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(derivedsAlternateId)), ((ValueComparer<long>)(((IProperty)principalsId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalsId)), ((ValueComparer<Guid>)(((IProperty)principalsAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalsAlternateId)), (source.GetCurrentValue<byte[]>(rowid) == null ? null : ((ValueComparer<byte[]>)(((IProperty)rowid).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(rowid))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, long, Guid, byte[]>(((ValueComparer<long>)(((IProperty)derivedsId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)derivedsAlternateId).GetValueComparer())).Snapshot(default(Guid)), ((ValueComparer<long>)(((IProperty)principalsId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalsAlternateId).GetValueComparer())).Snapshot(default(Guid)), (default(byte[]) == null ? null : ((ValueComparer<byte[]>)(((IProperty)rowid).GetValueComparer())).Snapshot(default(byte[])))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid, long, Guid, byte[]>(default(long), default(Guid), default(long), default(Guid), default(byte[])))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => Snapshot.Empty);
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((Dictionary<string, object>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, long, Guid>(((ValueComparer<long>)(((IProperty)derivedsId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(derivedsId)), ((ValueComparer<Guid>)(((IProperty)derivedsAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(derivedsAlternateId)), ((ValueComparer<long>)(((IProperty)principalsId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalsId)), ((ValueComparer<Guid>)(((IProperty)principalsAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalsAlternateId)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 5,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 5,
+                shadowCount: 0,
+                relationshipCount: 4,
+                storeGeneratedCount: 5));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBasePrincipalDerived<DependentBase<byte?>>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseUnsafeAccessors.cs
new file mode 100644
index 00000000..4b43c6dd
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseUnsafeAccessors.cs
@@ -0,0 +1,63 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class PrincipalBaseUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref long? Id(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum1>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AnEnum Enum1(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum2>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AnEnum? Enum2(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<FlagsEnum1>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AFlagsEnum FlagsEnum1(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "get_FlagsEnum2")]
+        public static extern CompiledModelTestBase.AFlagsEnum Get_FlagsEnum2(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "set_FlagsEnum2")]
+        public static extern void Set_FlagsEnum2(CompiledModelTestBase.PrincipalBase @this, CompiledModelTestBase.AFlagsEnum value);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeArray>k__BackingField")]
+        public static extern ref IPAddress[] RefTypeArray(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeEnumerable>k__BackingField")]
+        public static extern ref IEnumerable<string> RefTypeEnumerable(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeIList>k__BackingField")]
+        public static extern ref IList<string> RefTypeIList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeList>k__BackingField")]
+        public static extern ref List<IPAddress> RefTypeList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeArray>k__BackingField")]
+        public static extern ref DateTime[] ValueTypeArray(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeEnumerable>k__BackingField")]
+        public static extern ref IEnumerable<byte> ValueTypeEnumerable(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeIList>k__BackingField")]
+        public static extern ref IList<byte> ValueTypeIList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeList>k__BackingField")]
+        public static extern ref List<short> ValueTypeList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_ownedField")]
+        public static extern ref CompiledModelTestBase.OwnedType _ownedField(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Deriveds>k__BackingField")]
+        public static extern ref ICollection<CompiledModelTestBase.PrincipalBase> Deriveds(CompiledModelTestBase.PrincipalBase @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedEntityType.cs
new file mode 100644
index 00000000..c234c70b
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedEntityType.cs
@@ -0,0 +1,168 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                baseEntityType,
+                discriminatorValue: "PrincipalDerived<DependentBase<byte?>>",
+                propertyCount: 0,
+                navigationCount: 2,
+                skipNavigationCount: 1,
+                foreignKeyCount: 1);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeSkipNavigation CreateSkipNavigation1(RuntimeEntityType declaringEntityType, RuntimeEntityType targetEntityType, RuntimeEntityType joinEntityType)
+        {
+            var skipNavigation = declaringEntityType.AddSkipNavigation(
+                "Principals",
+                targetEntityType,
+                joinEntityType.FindForeignKey(
+                    new[] { joinEntityType.FindProperty("DerivedsId"), joinEntityType.FindProperty("DerivedsAlternateId") },
+                    declaringEntityType.FindKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") }),
+                    declaringEntityType),
+                true,
+                false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Principals", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Principals>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var inverse = targetEntityType.FindSkipNavigation("Deriveds");
+            if (inverse != null)
+            {
+                skipNavigation.Inverse = inverse;
+                inverse.Inverse = skipNavigation;
+            }
+
+            skipNavigation.SetGetter(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance),
+                bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance) == null);
+            skipNavigation.SetSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance) = value;
+                    return instance;
+                });
+            skipNavigation.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance) = value;
+                    return instance;
+                });
+            skipNavigation.SetAccessors(
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                null,
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => entry.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(skipNavigation));
+            skipNavigation.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 6,
+                storeGenerationIndex: -1);
+            skipNavigation.SetCollectionAccessor<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(entity),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, Action<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, ICollection<CompiledModelTestBase.PrincipalBase>> setter) => ClrCollectionAccessorFactory.CreateAndSetHashSet<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(entity, setter),
+                ICollection<CompiledModelTestBase.PrincipalBase> () => ((ICollection<CompiledModelTestBase.PrincipalBase>)(((ICollection<CompiledModelTestBase.PrincipalBase>)(new HashSet<CompiledModelTestBase.PrincipalBase>(ReferenceEqualityComparer.Instance))))));
+            return skipNavigation;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var alternateId = runtimeEntityType.FindProperty("AlternateId");
+            var enum1 = runtimeEntityType.FindProperty("Enum1");
+            var enum2 = runtimeEntityType.FindProperty("Enum2");
+            var flagsEnum1 = runtimeEntityType.FindProperty("FlagsEnum1");
+            var flagsEnum2 = runtimeEntityType.FindProperty("FlagsEnum2");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var owned = runtimeEntityType.FindNavigation("Owned");
+            var dependent = runtimeEntityType.FindNavigation("Dependent");
+            var manyOwned = runtimeEntityType.FindNavigation("ManyOwned");
+            var deriveds = runtimeEntityType.FindSkipNavigation("Deriveds");
+            var principals = runtimeEntityType.FindSkipNavigation("Principals");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, Guid, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum, CompiledModelTestBase.AFlagsEnum, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1)), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long?, Guid>((default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(default(long? ))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetValueComparer())).Snapshot(default(Guid))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long?, Guid>(default(long? ), default(Guid)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => Snapshot.Empty);
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, Guid, object, object, object, object, object>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), source.GetCurrentValue<CompiledModelTestBase.OwnedType>(owned), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds)), source.GetCurrentValue<CompiledModelTestBase.DependentBase<byte?>>(dependent), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<IList<CompiledModelTestBase.OwnedType>>(manyOwned)), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(principals)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 14,
+                navigationCount: 5,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 14,
+                shadowCount: 0,
+                relationshipCount: 7,
+                storeGeneratedCount: 2));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalDerived");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedUnsafeAccessors.cs
new file mode 100644
index 00000000..105dc525
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedUnsafeAccessors.cs
@@ -0,0 +1,23 @@
+// <auto-generated />
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class PrincipalDerivedUnsafeAccessors<TDependent>
+        where TDependent : class
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Dependent>k__BackingField")]
+        public static extern ref TDependent Dependent(CompiledModelTestBase.PrincipalDerived<TDependent> @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "ManyOwned")]
+        public static extern ref IList<CompiledModelTestBase.OwnedType> ManyOwned(CompiledModelTestBase.PrincipalDerived<TDependent> @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Principals>k__BackingField")]
+        public static extern ref ICollection<CompiledModelTestBase.PrincipalBase> Principals(CompiledModelTestBase.PrincipalDerived<TDependent> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModelBuilder.cs
new file mode 100644
index 00000000..4844e4f2
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModelBuilder.cs
@@ -0,0 +1,2599 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Update.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 8)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var dependentBase = DependentBaseEntityType.Create(this);
+            var manyTypes = ManyTypesEntityType.Create(this);
+            var principalBase = PrincipalBaseEntityType.Create(this);
+            var ownedType = OwnedTypeEntityType.Create(this);
+            var ownedType0 = OwnedType0EntityType.Create(this);
+            var principalBasePrincipalDerivedDependentBasebyte = PrincipalBasePrincipalDerivedDependentBasebyteEntityType.Create(this);
+            var dependentDerived = DependentDerivedEntityType.Create(this, dependentBase);
+            var principalDerived = PrincipalDerivedEntityType.Create(this, principalBase);
+
+            DependentBaseEntityType.CreateForeignKey1(dependentBase, principalBase);
+            DependentBaseEntityType.CreateForeignKey2(dependentBase, principalDerived);
+            OwnedTypeEntityType.CreateForeignKey1(ownedType, principalBase);
+            OwnedType0EntityType.CreateForeignKey1(ownedType0, principalDerived);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateForeignKey1(principalBasePrincipalDerivedDependentBasebyte, principalDerived);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateForeignKey2(principalBasePrincipalDerivedDependentBasebyte, principalBase);
+
+            PrincipalBaseEntityType.CreateSkipNavigation1(principalBase, principalDerived, principalBasePrincipalDerivedDependentBasebyte);
+            PrincipalDerivedEntityType.CreateSkipNavigation1(principalDerived, principalBase, principalBasePrincipalDerivedDependentBasebyte);
+
+            DependentBaseEntityType.CreateAnnotations(dependentBase);
+            ManyTypesEntityType.CreateAnnotations(manyTypes);
+            PrincipalBaseEntityType.CreateAnnotations(principalBase);
+            OwnedTypeEntityType.CreateAnnotations(ownedType);
+            OwnedType0EntityType.CreateAnnotations(ownedType0);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateAnnotations(principalBasePrincipalDerivedDependentBasebyte);
+            DependentDerivedEntityType.CreateAnnotations(dependentDerived);
+            PrincipalDerivedEntityType.CreateAnnotations(principalDerived);
+
+            AddAnnotation("Jet:IdentityIncrement", 2);
+            AddAnnotation("Jet:IdentitySeed", 3);
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var dependentBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            dependentBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", null, relationalModel);
+            var dataColumnBase = new ColumnBase<ColumnMappingBase>("Data", "char(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Data", dataColumnBase);
+            var enumDiscriminatorColumnBase = new ColumnBase<ColumnMappingBase>("EnumDiscriminator", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("EnumDiscriminator", enumDiscriminatorColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Id", idColumnBase);
+            var moneyColumnBase = new ColumnBase<ColumnMappingBase>("Money", "decimal(9,3)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Money", moneyColumnBase);
+            var principalAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalAlternateId", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalAlternateId", principalAlternateIdColumnBase);
+            var principalIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalId", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalId", principalIdColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(dependentBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalAlternateIdColumnBase, dependentBase.FindProperty("PrincipalAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalIdColumnBase, dependentBase.FindProperty("PrincipalId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumDiscriminatorColumnBase, dependentBase.FindProperty("EnumDiscriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, dependentBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            dependentBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dependentBasebyteTable = new Table("DependentBase<byte?>", null, relationalModel);
+            var principalIdColumn = new Column("PrincipalId", "decimal(20,0)", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("PrincipalId", principalIdColumn);
+            principalIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(principalIdColumn);
+            var principalAlternateIdColumn = new Column("PrincipalAlternateId", "uniqueidentifier", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("PrincipalAlternateId", principalAlternateIdColumn);
+            principalAlternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(principalAlternateIdColumn);
+            var dataColumn = new Column("Data", "char(20)", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("Data", dataColumn);
+            dataColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dataColumn);
+            var enumDiscriminatorColumn = new Column("EnumDiscriminator", "integer", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("EnumDiscriminator", enumDiscriminatorColumn);
+            enumDiscriminatorColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enumDiscriminatorColumn);
+            var idColumn = new Column("Id", "byte", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("Id", idColumn);
+            idColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(idColumn);
+            var moneyColumn = new Column("Money", "decimal(9,3)", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("Money", moneyColumn);
+            moneyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(moneyColumn);
+            relationalModel.Tables.Add(("DependentBase<byte?>", null), dependentBasebyteTable);
+            var dependentBasebyteTableMapping = new TableMapping(dependentBase, dependentBasebyteTable, true)
+            {
+                IsSharedTablePrincipal = true,
+            };
+            dependentBasebyteTable.AddTypeMapping(dependentBasebyteTableMapping, false);
+            tableMappings.Add(dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalAlternateIdColumn, dependentBase.FindProperty("PrincipalAlternateId")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalIdColumn, dependentBase.FindProperty("PrincipalId")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(enumDiscriminatorColumn, dependentBase.FindProperty("EnumDiscriminator")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, dependentBase.FindProperty("Id")!, dependentBasebyteTableMapping);
+
+            var dependentDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<byte?>")!;
+
+            var defaultTableMappings0 = new List<TableMappingBase<ColumnMappingBase>>();
+            dependentDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0 = new TableMappingBase<ColumnMappingBase>(dependentDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0, false);
+            defaultTableMappings0.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalAlternateIdColumnBase, dependentDerived.FindProperty("PrincipalAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalIdColumnBase, dependentDerived.FindProperty("PrincipalId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dataColumnBase, dependentDerived.FindProperty("Data")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumDiscriminatorColumnBase, dependentDerived.FindProperty("EnumDiscriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, dependentDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)moneyColumnBase, dependentDerived.FindProperty("Money")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+
+            var tableMappings0 = new List<TableMapping>();
+            dependentDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings0);
+            var dependentBasebyteTableMapping0 = new TableMapping(dependentDerived, dependentBasebyteTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            dependentBasebyteTable.AddTypeMapping(dependentBasebyteTableMapping0, false);
+            tableMappings0.Add(dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(principalAlternateIdColumn, dependentDerived.FindProperty("PrincipalAlternateId")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(principalIdColumn, dependentDerived.FindProperty("PrincipalId")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(dataColumn, dependentDerived.FindProperty("Data")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(enumDiscriminatorColumn, dependentDerived.FindProperty("EnumDiscriminator")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(idColumn, dependentDerived.FindProperty("Id")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(moneyColumn, dependentDerived.FindProperty("Money")!, dependentBasebyteTableMapping0);
+            var pK_DependentBasebyte = new UniqueConstraint("PK_DependentBase<byte?>", dependentBasebyteTable, new[] { principalIdColumn, principalAlternateIdColumn });
+            dependentBasebyteTable.PrimaryKey = pK_DependentBasebyte;
+            pK_DependentBasebyte.SetRowKeyValueFactory(new CompositeRowKeyValueFactory(pK_DependentBasebyte));
+            var pK_DependentBasebyteKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId", "PrincipalAlternateId" });
+            pK_DependentBasebyte.MappedKeys.Add(pK_DependentBasebyteKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DependentBasebyteKey).Add(pK_DependentBasebyte);
+            dependentBasebyteTable.UniqueConstraints.Add("PK_DependentBase<byte?>", pK_DependentBasebyte);
+            var iX_DependentBasebyte_PrincipalId = new TableIndex(
+            "IX_DependentBase<byte?>_PrincipalId", dependentBasebyteTable, new[] { principalIdColumn }, true);
+            iX_DependentBasebyte_PrincipalId.SetRowIndexValueFactory(new SimpleRowIndexValueFactory<long>(iX_DependentBasebyte_PrincipalId));
+            var iX_DependentBasebyte_PrincipalIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" });
+            iX_DependentBasebyte_PrincipalId.MappedIndexes.Add(iX_DependentBasebyte_PrincipalIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_DependentBasebyte_PrincipalIdIx).Add(iX_DependentBasebyte_PrincipalId);
+            dependentBasebyteTable.Indexes.Add("IX_DependentBase<byte?>_PrincipalId", iX_DependentBasebyte_PrincipalId);
+
+            var manyTypes = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes")!;
+
+            var defaultTableMappings1 = new List<TableMappingBase<ColumnMappingBase>>();
+            manyTypes.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings1);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes", null, relationalModel);
+            var boolColumnBase = new ColumnBase<ColumnMappingBase>("Bool", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Bool", boolColumnBase);
+            var boolArrayColumnBase = new ColumnBase<ColumnMappingBase>("BoolArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolArray", boolArrayColumnBase);
+            var boolReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("BoolReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolReadOnlyCollection", boolReadOnlyCollectionColumnBase);
+            var boolToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BoolToStringConverterProperty", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolToStringConverterProperty", boolToStringConverterPropertyColumnBase);
+            var boolToTwoValuesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BoolToTwoValuesConverterProperty", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolToTwoValuesConverterProperty", boolToTwoValuesConverterPropertyColumnBase);
+            var boolToZeroOneConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BoolToZeroOneConverterProperty", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolToZeroOneConverterProperty", boolToZeroOneConverterPropertyColumnBase);
+            var bytesColumnBase = new ColumnBase<ColumnMappingBase>("Bytes", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Bytes", bytesColumnBase);
+            var bytesArrayColumnBase = new ColumnBase<ColumnMappingBase>("BytesArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BytesArray", bytesArrayColumnBase);
+            var bytesToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BytesToStringConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BytesToStringConverterProperty", bytesToStringConverterPropertyColumnBase);
+            var castingConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("CastingConverterProperty", "decimal(18,2)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CastingConverterProperty", castingConverterPropertyColumnBase);
+            var charColumnBase = new ColumnBase<ColumnMappingBase>("Char", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Char", charColumnBase);
+            var charArrayColumnBase = new ColumnBase<ColumnMappingBase>("CharArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharArray", charArrayColumnBase);
+            var charToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("CharToStringConverterProperty", "char(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumnBase);
+            var dateOnlyColumnBase = new ColumnBase<ColumnMappingBase>("DateOnly", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnly", dateOnlyColumnBase);
+            var dateOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("DateOnlyArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnlyArray", dateOnlyArrayColumnBase);
+            var dateOnlyToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateOnlyToStringConverterProperty", "varchar(10)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnlyToStringConverterProperty", dateOnlyToStringConverterPropertyColumnBase);
+            var dateTimeColumnBase = new ColumnBase<ColumnMappingBase>("DateTime", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTime", dateTimeColumnBase);
+            var dateTimeArrayColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeArray", dateTimeArrayColumnBase);
+            var dateTimeOffsetToBinaryConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeOffsetToBinaryConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeOffsetToBinaryConverterProperty", dateTimeOffsetToBinaryConverterPropertyColumnBase);
+            var dateTimeOffsetToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeOffsetToBytesConverterProperty", "varbinary(12)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeOffsetToBytesConverterProperty", dateTimeOffsetToBytesConverterPropertyColumnBase);
+            var dateTimeOffsetToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeOffsetToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeOffsetToStringConverterProperty", dateTimeOffsetToStringConverterPropertyColumnBase);
+            var dateTimeToBinaryConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeToBinaryConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeToBinaryConverterProperty", dateTimeToBinaryConverterPropertyColumnBase);
+            var dateTimeToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeToStringConverterProperty", dateTimeToStringConverterPropertyColumnBase);
+            var dateTimeToTicksConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeToTicksConverterProperty", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeToTicksConverterProperty", dateTimeToTicksConverterPropertyColumnBase);
+            var decimalColumnBase = new ColumnBase<ColumnMappingBase>("Decimal", "decimal(18,2)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Decimal", decimalColumnBase);
+            var decimalArrayColumnBase = new ColumnBase<ColumnMappingBase>("DecimalArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DecimalArray", decimalArrayColumnBase);
+            var decimalNumberToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DecimalNumberToBytesConverterProperty", "varbinary(16)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DecimalNumberToBytesConverterProperty", decimalNumberToBytesConverterPropertyColumnBase);
+            var decimalNumberToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DecimalNumberToStringConverterProperty", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DecimalNumberToStringConverterProperty", decimalNumberToStringConverterPropertyColumnBase);
+            var doubleColumnBase = new ColumnBase<ColumnMappingBase>("Double", "double", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Double", doubleColumnBase);
+            var doubleArrayColumnBase = new ColumnBase<ColumnMappingBase>("DoubleArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DoubleArray", doubleArrayColumnBase);
+            var doubleNumberToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DoubleNumberToBytesConverterProperty", "varbinary(8)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DoubleNumberToBytesConverterProperty", doubleNumberToBytesConverterPropertyColumnBase);
+            var doubleNumberToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DoubleNumberToStringConverterProperty", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DoubleNumberToStringConverterProperty", doubleNumberToStringConverterPropertyColumnBase);
+            var enum16ColumnBase = new ColumnBase<ColumnMappingBase>("Enum16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16", enum16ColumnBase);
+            var enum16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16Array", enum16ArrayColumnBase);
+            var enum16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum16AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16AsString", enum16AsStringColumnBase);
+            var enum16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum16AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16AsStringArray", enum16AsStringArrayColumnBase);
+            var enum16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum16AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16AsStringCollection", enum16AsStringCollectionColumnBase);
+            var enum16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum16Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16Collection", enum16CollectionColumnBase);
+            var enum32ColumnBase = new ColumnBase<ColumnMappingBase>("Enum32", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32", enum32ColumnBase);
+            var enum32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32Array", enum32ArrayColumnBase);
+            var enum32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum32AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32AsString", enum32AsStringColumnBase);
+            var enum32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum32AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32AsStringArray", enum32AsStringArrayColumnBase);
+            var enum32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum32AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32AsStringCollection", enum32AsStringCollectionColumnBase);
+            var enum32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum32Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32Collection", enum32CollectionColumnBase);
+            var enum64ColumnBase = new ColumnBase<ColumnMappingBase>("Enum64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64", enum64ColumnBase);
+            var enum64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64Array", enum64ArrayColumnBase);
+            var enum64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum64AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64AsString", enum64AsStringColumnBase);
+            var enum64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum64AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64AsStringArray", enum64AsStringArrayColumnBase);
+            var enum64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum64AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64AsStringCollection", enum64AsStringCollectionColumnBase);
+            var enum64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum64Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64Collection", enum64CollectionColumnBase);
+            var enum8ColumnBase = new ColumnBase<ColumnMappingBase>("Enum8", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8", enum8ColumnBase);
+            var enum8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8Array", enum8ArrayColumnBase);
+            var enum8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum8AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8AsString", enum8AsStringColumnBase);
+            var enum8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum8AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8AsStringArray", enum8AsStringArrayColumnBase);
+            var enum8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum8AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8AsStringCollection", enum8AsStringCollectionColumnBase);
+            var enum8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum8Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8Collection", enum8CollectionColumnBase);
+            var enumToNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("EnumToNumberConverterProperty", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumToNumberConverterProperty", enumToNumberConverterPropertyColumnBase);
+            var enumToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("EnumToStringConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumToStringConverterProperty", enumToStringConverterPropertyColumnBase);
+            var enumU16ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16", enumU16ColumnBase);
+            var enumU16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16Array", enumU16ArrayColumnBase);
+            var enumU16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16AsString", enumU16AsStringColumnBase);
+            var enumU16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16AsStringArray", enumU16AsStringArrayColumnBase);
+            var enumU16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16AsStringCollection", enumU16AsStringCollectionColumnBase);
+            var enumU16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16Collection", enumU16CollectionColumnBase);
+            var enumU32ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32", enumU32ColumnBase);
+            var enumU32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32Array", enumU32ArrayColumnBase);
+            var enumU32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32AsString", enumU32AsStringColumnBase);
+            var enumU32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32AsStringArray", enumU32AsStringArrayColumnBase);
+            var enumU32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32AsStringCollection", enumU32AsStringCollectionColumnBase);
+            var enumU32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32Collection", enumU32CollectionColumnBase);
+            var enumU64ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64", enumU64ColumnBase);
+            var enumU64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64Array", enumU64ArrayColumnBase);
+            var enumU64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64AsString", enumU64AsStringColumnBase);
+            var enumU64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64AsStringArray", enumU64AsStringArrayColumnBase);
+            var enumU64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64AsStringCollection", enumU64AsStringCollectionColumnBase);
+            var enumU64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64Collection", enumU64CollectionColumnBase);
+            var enumU8ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8", enumU8ColumnBase);
+            var enumU8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8Array", enumU8ArrayColumnBase);
+            var enumU8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8AsString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8AsString", enumU8AsStringColumnBase);
+            var enumU8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8AsStringArray", enumU8AsStringArrayColumnBase);
+            var enumU8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8AsStringCollection", enumU8AsStringCollectionColumnBase);
+            var enumU8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8Collection", enumU8CollectionColumnBase);
+            var floatColumnBase = new ColumnBase<ColumnMappingBase>("Float", "single", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Float", floatColumnBase);
+            var floatArrayColumnBase = new ColumnBase<ColumnMappingBase>("FloatArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("FloatArray", floatArrayColumnBase);
+            var guidColumnBase = new ColumnBase<ColumnMappingBase>("Guid", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Guid", guidColumnBase);
+            var guidArrayColumnBase = new ColumnBase<ColumnMappingBase>("GuidArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("GuidArray", guidArrayColumnBase);
+            var guidToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("GuidToBytesConverterProperty", "varbinary(16)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("GuidToBytesConverterProperty", guidToBytesConverterPropertyColumnBase);
+            var guidToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("GuidToStringConverterProperty", "varchar(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("GuidToStringConverterProperty", guidToStringConverterPropertyColumnBase);
+            var iPAddressColumnBase = new ColumnBase<ColumnMappingBase>("IPAddress", "varchar(45)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddress", iPAddressColumnBase);
+            var iPAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressArray", iPAddressArrayColumnBase);
+            var iPAddressReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressReadOnlyCollection", iPAddressReadOnlyCollectionColumnBase);
+            var iPAddressToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressToBytesConverterProperty", "varbinary(16)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressToBytesConverterProperty", iPAddressToBytesConverterPropertyColumnBase);
+            var iPAddressToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressToStringConverterProperty", "varchar(45)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressToStringConverterProperty", iPAddressToStringConverterPropertyColumnBase);
+            var idColumnBase0 = new ColumnBase<ColumnMappingBase>("Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Id", idColumnBase0);
+            var int16ColumnBase = new ColumnBase<ColumnMappingBase>("Int16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int16", int16ColumnBase);
+            var int16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int16Array", int16ArrayColumnBase);
+            var int32ColumnBase = new ColumnBase<ColumnMappingBase>("Int32", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int32", int32ColumnBase);
+            var int32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int32Array", int32ArrayColumnBase);
+            var int32ReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Int32ReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int32ReadOnlyCollection", int32ReadOnlyCollectionColumnBase);
+            var int64ColumnBase = new ColumnBase<ColumnMappingBase>("Int64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int64", int64ColumnBase);
+            var int64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int64Array", int64ArrayColumnBase);
+            var int8ColumnBase = new ColumnBase<ColumnMappingBase>("Int8", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int8", int8ColumnBase);
+            var int8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int8Array", int8ArrayColumnBase);
+            var intNumberToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IntNumberToBytesConverterProperty", "varbinary(4)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IntNumberToBytesConverterProperty", intNumberToBytesConverterPropertyColumnBase);
+            var intNumberToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IntNumberToStringConverterProperty", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IntNumberToStringConverterProperty", intNumberToStringConverterPropertyColumnBase);
+            var nullIntToNullStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("NullIntToNullStringConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullIntToNullStringConverterProperty", nullIntToNullStringConverterPropertyColumnBase);
+            var nullableBoolColumnBase = new ColumnBase<ColumnMappingBase>("NullableBool", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBool", nullableBoolColumnBase);
+            var nullableBoolArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableBoolArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBoolArray", nullableBoolArrayColumnBase);
+            var nullableBytesColumnBase = new ColumnBase<ColumnMappingBase>("NullableBytes", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBytes", nullableBytesColumnBase);
+            var nullableBytesArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableBytesArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBytesArray", nullableBytesArrayColumnBase);
+            var nullableCharColumnBase = new ColumnBase<ColumnMappingBase>("NullableChar", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableChar", nullableCharColumnBase);
+            var nullableCharArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableCharArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableCharArray", nullableCharArrayColumnBase);
+            var nullableDateOnlyColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateOnly", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateOnly", nullableDateOnlyColumnBase);
+            var nullableDateOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateOnlyArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateOnlyArray", nullableDateOnlyArrayColumnBase);
+            var nullableDateTimeColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateTime", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateTime", nullableDateTimeColumnBase);
+            var nullableDateTimeArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateTimeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateTimeArray", nullableDateTimeArrayColumnBase);
+            var nullableDecimalColumnBase = new ColumnBase<ColumnMappingBase>("NullableDecimal", "decimal(18,2)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDecimal", nullableDecimalColumnBase);
+            var nullableDecimalArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDecimalArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDecimalArray", nullableDecimalArrayColumnBase);
+            var nullableDoubleColumnBase = new ColumnBase<ColumnMappingBase>("NullableDouble", "double", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDouble", nullableDoubleColumnBase);
+            var nullableDoubleArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDoubleArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDoubleArray", nullableDoubleArrayColumnBase);
+            var nullableEnum16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16", nullableEnum16ColumnBase);
+            var nullableEnum16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16Array", nullableEnum16ArrayColumnBase);
+            var nullableEnum16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16AsString", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16AsString", nullableEnum16AsStringColumnBase);
+            var nullableEnum16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16AsStringArray", nullableEnum16AsStringArrayColumnBase);
+            var nullableEnum16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16AsStringCollection", nullableEnum16AsStringCollectionColumnBase);
+            var nullableEnum16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16Collection", nullableEnum16CollectionColumnBase);
+            var nullableEnum32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32", nullableEnum32ColumnBase);
+            var nullableEnum32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32Array", nullableEnum32ArrayColumnBase);
+            var nullableEnum32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32AsString", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32AsString", nullableEnum32AsStringColumnBase);
+            var nullableEnum32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32AsStringArray", nullableEnum32AsStringArrayColumnBase);
+            var nullableEnum32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32AsStringCollection", nullableEnum32AsStringCollectionColumnBase);
+            var nullableEnum32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32Collection", nullableEnum32CollectionColumnBase);
+            var nullableEnum64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64", nullableEnum64ColumnBase);
+            var nullableEnum64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64Array", nullableEnum64ArrayColumnBase);
+            var nullableEnum64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64AsString", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64AsString", nullableEnum64AsStringColumnBase);
+            var nullableEnum64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64AsStringArray", nullableEnum64AsStringArrayColumnBase);
+            var nullableEnum64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64AsStringCollection", nullableEnum64AsStringCollectionColumnBase);
+            var nullableEnum64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64Collection", nullableEnum64CollectionColumnBase);
+            var nullableEnum8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8", nullableEnum8ColumnBase);
+            var nullableEnum8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8Array", nullableEnum8ArrayColumnBase);
+            var nullableEnum8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8AsString", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8AsString", nullableEnum8AsStringColumnBase);
+            var nullableEnum8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8AsStringArray", nullableEnum8AsStringArrayColumnBase);
+            var nullableEnum8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8AsStringCollection", nullableEnum8AsStringCollectionColumnBase);
+            var nullableEnum8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8Collection", nullableEnum8CollectionColumnBase);
+            var nullableEnumU16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16", nullableEnumU16ColumnBase);
+            var nullableEnumU16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16Array", nullableEnumU16ArrayColumnBase);
+            var nullableEnumU16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16AsString", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16AsString", nullableEnumU16AsStringColumnBase);
+            var nullableEnumU16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16AsStringArray", nullableEnumU16AsStringArrayColumnBase);
+            var nullableEnumU16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16AsStringCollection", nullableEnumU16AsStringCollectionColumnBase);
+            var nullableEnumU16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16Collection", nullableEnumU16CollectionColumnBase);
+            var nullableEnumU32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32", nullableEnumU32ColumnBase);
+            var nullableEnumU32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32Array", nullableEnumU32ArrayColumnBase);
+            var nullableEnumU32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32AsString", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32AsString", nullableEnumU32AsStringColumnBase);
+            var nullableEnumU32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32AsStringArray", nullableEnumU32AsStringArrayColumnBase);
+            var nullableEnumU32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32AsStringCollection", nullableEnumU32AsStringCollectionColumnBase);
+            var nullableEnumU32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32Collection", nullableEnumU32CollectionColumnBase);
+            var nullableEnumU64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64", nullableEnumU64ColumnBase);
+            var nullableEnumU64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64Array", nullableEnumU64ArrayColumnBase);
+            var nullableEnumU64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64AsString", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64AsString", nullableEnumU64AsStringColumnBase);
+            var nullableEnumU64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64AsStringArray", nullableEnumU64AsStringArrayColumnBase);
+            var nullableEnumU64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64AsStringCollection", nullableEnumU64AsStringCollectionColumnBase);
+            var nullableEnumU64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64Collection", nullableEnumU64CollectionColumnBase);
+            var nullableEnumU8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8", nullableEnumU8ColumnBase);
+            var nullableEnumU8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8Array", nullableEnumU8ArrayColumnBase);
+            var nullableEnumU8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8AsString", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8AsString", nullableEnumU8AsStringColumnBase);
+            var nullableEnumU8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8AsStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8AsStringArray", nullableEnumU8AsStringArrayColumnBase);
+            var nullableEnumU8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8AsStringCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8AsStringCollection", nullableEnumU8AsStringCollectionColumnBase);
+            var nullableEnumU8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8Collection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8Collection", nullableEnumU8CollectionColumnBase);
+            var nullableFloatColumnBase = new ColumnBase<ColumnMappingBase>("NullableFloat", "single", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableFloat", nullableFloatColumnBase);
+            var nullableFloatArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableFloatArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableFloatArray", nullableFloatArrayColumnBase);
+            var nullableGuidColumnBase = new ColumnBase<ColumnMappingBase>("NullableGuid", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableGuid", nullableGuidColumnBase);
+            var nullableGuidArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableGuidArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableGuidArray", nullableGuidArrayColumnBase);
+            var nullableIPAddressColumnBase = new ColumnBase<ColumnMappingBase>("NullableIPAddress", "varchar(45)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableIPAddress", nullableIPAddressColumnBase);
+            var nullableIPAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableIPAddressArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableIPAddressArray", nullableIPAddressArrayColumnBase);
+            var nullableInt16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt16", nullableInt16ColumnBase);
+            var nullableInt16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt16Array", nullableInt16ArrayColumnBase);
+            var nullableInt32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt32", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt32", nullableInt32ColumnBase);
+            var nullableInt32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt32Array", nullableInt32ArrayColumnBase);
+            var nullableInt64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt64", nullableInt64ColumnBase);
+            var nullableInt64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt64Array", nullableInt64ArrayColumnBase);
+            var nullableInt8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt8", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt8", nullableInt8ColumnBase);
+            var nullableInt8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt8Array", nullableInt8ArrayColumnBase);
+            var nullablePhysicalAddressColumnBase = new ColumnBase<ColumnMappingBase>("NullablePhysicalAddress", "varchar(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullablePhysicalAddress", nullablePhysicalAddressColumnBase);
+            var nullablePhysicalAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullablePhysicalAddressArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullablePhysicalAddressArray", nullablePhysicalAddressArrayColumnBase);
+            var nullableStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableString", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableString", nullableStringColumnBase);
+            var nullableStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableStringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableStringArray", nullableStringArrayColumnBase);
+            var nullableTimeOnlyColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeOnly", "time", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeOnly", nullableTimeOnlyColumnBase);
+            var nullableTimeOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeOnlyArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeOnlyArray", nullableTimeOnlyArrayColumnBase);
+            var nullableTimeSpanColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeSpan", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeSpan", nullableTimeSpanColumnBase);
+            var nullableTimeSpanArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeSpanArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeSpanArray", nullableTimeSpanArrayColumnBase);
+            var nullableUInt16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt16", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt16", nullableUInt16ColumnBase);
+            var nullableUInt16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt16Array", nullableUInt16ArrayColumnBase);
+            var nullableUInt32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt32", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt32", nullableUInt32ColumnBase);
+            var nullableUInt32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt32Array", nullableUInt32ArrayColumnBase);
+            var nullableUInt64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt64", nullableUInt64ColumnBase);
+            var nullableUInt64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt64Array", nullableUInt64ArrayColumnBase);
+            var nullableUInt8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt8", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt8", nullableUInt8ColumnBase);
+            var nullableUInt8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt8Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt8Array", nullableUInt8ArrayColumnBase);
+            var nullableUriColumnBase = new ColumnBase<ColumnMappingBase>("NullableUri", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUri", nullableUriColumnBase);
+            var nullableUriArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUriArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUriArray", nullableUriArrayColumnBase);
+            var physicalAddressColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddress", "varchar(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddress", physicalAddressColumnBase);
+            var physicalAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddressArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddressArray", physicalAddressArrayColumnBase);
+            var physicalAddressToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddressToBytesConverterProperty", "varbinary(8)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddressToBytesConverterProperty", physicalAddressToBytesConverterPropertyColumnBase);
+            var physicalAddressToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddressToStringConverterProperty", "varchar(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddressToStringConverterProperty", physicalAddressToStringConverterPropertyColumnBase);
+            var stringColumnBase = new ColumnBase<ColumnMappingBase>("String", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("String", stringColumnBase);
+            var stringArrayColumnBase = new ColumnBase<ColumnMappingBase>("StringArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringArray", stringArrayColumnBase);
+            var stringReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("StringReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringReadOnlyCollection", stringReadOnlyCollectionColumnBase);
+            var stringToBoolConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToBoolConverterProperty", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToBoolConverterProperty", stringToBoolConverterPropertyColumnBase);
+            var stringToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToBytesConverterProperty", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToBytesConverterProperty", stringToBytesConverterPropertyColumnBase);
+            var stringToCharConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToCharConverterProperty", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToCharConverterProperty", stringToCharConverterPropertyColumnBase);
+            var stringToDateOnlyConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDateOnlyConverterProperty", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDateOnlyConverterProperty", stringToDateOnlyConverterPropertyColumnBase);
+            var stringToDateTimeConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDateTimeConverterProperty", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDateTimeConverterProperty", stringToDateTimeConverterPropertyColumnBase);
+            var stringToDateTimeOffsetConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDateTimeOffsetConverterProperty", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDateTimeOffsetConverterProperty", stringToDateTimeOffsetConverterPropertyColumnBase);
+            var stringToDecimalNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDecimalNumberConverterProperty", "decimal(18,2)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDecimalNumberConverterProperty", stringToDecimalNumberConverterPropertyColumnBase);
+            var stringToDoubleNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDoubleNumberConverterProperty", "double", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDoubleNumberConverterProperty", stringToDoubleNumberConverterPropertyColumnBase);
+            var stringToEnumConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToEnumConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToEnumConverterProperty", stringToEnumConverterPropertyColumnBase);
+            var stringToGuidConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToGuidConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToGuidConverterProperty", stringToGuidConverterPropertyColumnBase);
+            var stringToIntNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToIntNumberConverterProperty", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToIntNumberConverterProperty", stringToIntNumberConverterPropertyColumnBase);
+            var stringToTimeOnlyConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToTimeOnlyConverterProperty", "time", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToTimeOnlyConverterProperty", stringToTimeOnlyConverterPropertyColumnBase);
+            var stringToTimeSpanConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToTimeSpanConverterProperty", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToTimeSpanConverterProperty", stringToTimeSpanConverterPropertyColumnBase);
+            var stringToUriConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToUriConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToUriConverterProperty", stringToUriConverterPropertyColumnBase);
+            var timeOnlyColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnly", "time", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnly", timeOnlyColumnBase);
+            var timeOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnlyArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnlyArray", timeOnlyArrayColumnBase);
+            var timeOnlyToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnlyToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnlyToStringConverterProperty", timeOnlyToStringConverterPropertyColumnBase);
+            var timeOnlyToTicksConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnlyToTicksConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnlyToTicksConverterProperty", timeOnlyToTicksConverterPropertyColumnBase);
+            var timeSpanColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpan", "datetime", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpan", timeSpanColumnBase);
+            var timeSpanArrayColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpanArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpanArray", timeSpanArrayColumnBase);
+            var timeSpanToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpanToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpanToStringConverterProperty", timeSpanToStringConverterPropertyColumnBase);
+            var timeSpanToTicksConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpanToTicksConverterProperty", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpanToTicksConverterProperty", timeSpanToTicksConverterPropertyColumnBase);
+            var uInt16ColumnBase = new ColumnBase<ColumnMappingBase>("UInt16", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt16", uInt16ColumnBase);
+            var uInt16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt16Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt16Array", uInt16ArrayColumnBase);
+            var uInt32ColumnBase = new ColumnBase<ColumnMappingBase>("UInt32", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt32", uInt32ColumnBase);
+            var uInt32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt32Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt32Array", uInt32ArrayColumnBase);
+            var uInt64ColumnBase = new ColumnBase<ColumnMappingBase>("UInt64", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt64", uInt64ColumnBase);
+            var uInt64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt64Array", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt64Array", uInt64ArrayColumnBase);
+            var uInt8ColumnBase = new ColumnBase<ColumnMappingBase>("UInt8", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt8", uInt8ColumnBase);
+            var uInt8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt8Array", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt8Array", uInt8ArrayColumnBase);
+            var uInt8ReadOnlyCollectionColumnBase = new ColumnBase<ColumnMappingBase>("UInt8ReadOnlyCollection", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt8ReadOnlyCollection", uInt8ReadOnlyCollectionColumnBase);
+            var uriColumnBase = new ColumnBase<ColumnMappingBase>("Uri", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Uri", uriColumnBase);
+            var uriArrayColumnBase = new ColumnBase<ColumnMappingBase>("UriArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UriArray", uriArrayColumnBase);
+            var uriToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("UriToStringConverterProperty", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UriToStringConverterProperty", uriToStringConverterPropertyColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase = new TableMappingBase<ColumnMappingBase>(manyTypes, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase, false);
+            defaultTableMappings1.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase0, manyTypes.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolColumnBase, manyTypes.FindProperty("Bool")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolArrayColumnBase, manyTypes.FindProperty("BoolArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolReadOnlyCollectionColumnBase, manyTypes.FindProperty("BoolReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolToStringConverterPropertyColumnBase, manyTypes.FindProperty("BoolToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolToTwoValuesConverterPropertyColumnBase, manyTypes.FindProperty("BoolToTwoValuesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolToZeroOneConverterPropertyColumnBase, manyTypes.FindProperty("BoolToZeroOneConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)bytesColumnBase, manyTypes.FindProperty("Bytes")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)bytesArrayColumnBase, manyTypes.FindProperty("BytesArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)bytesToStringConverterPropertyColumnBase, manyTypes.FindProperty("BytesToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)castingConverterPropertyColumnBase, manyTypes.FindProperty("CastingConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)charColumnBase, manyTypes.FindProperty("Char")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)charArrayColumnBase, manyTypes.FindProperty("CharArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)charToStringConverterPropertyColumnBase, manyTypes.FindProperty("CharToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateOnlyColumnBase, manyTypes.FindProperty("DateOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateOnlyArrayColumnBase, manyTypes.FindProperty("DateOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateOnlyToStringConverterPropertyColumnBase, manyTypes.FindProperty("DateOnlyToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeColumnBase, manyTypes.FindProperty("DateTime")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeArrayColumnBase, manyTypes.FindProperty("DateTimeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeOffsetToBinaryConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeOffsetToBinaryConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeOffsetToBytesConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeOffsetToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeOffsetToStringConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeOffsetToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeToBinaryConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeToBinaryConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeToStringConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeToTicksConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeToTicksConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalColumnBase, manyTypes.FindProperty("Decimal")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalArrayColumnBase, manyTypes.FindProperty("DecimalArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalNumberToBytesConverterPropertyColumnBase, manyTypes.FindProperty("DecimalNumberToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalNumberToStringConverterPropertyColumnBase, manyTypes.FindProperty("DecimalNumberToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleColumnBase, manyTypes.FindProperty("Double")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleArrayColumnBase, manyTypes.FindProperty("DoubleArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleNumberToBytesConverterPropertyColumnBase, manyTypes.FindProperty("DoubleNumberToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleNumberToStringConverterPropertyColumnBase, manyTypes.FindProperty("DoubleNumberToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16ColumnBase, manyTypes.FindProperty("Enum16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16ArrayColumnBase, manyTypes.FindProperty("Enum16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16AsStringColumnBase, manyTypes.FindProperty("Enum16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16AsStringArrayColumnBase, manyTypes.FindProperty("Enum16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16AsStringCollectionColumnBase, manyTypes.FindProperty("Enum16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16CollectionColumnBase, manyTypes.FindProperty("Enum16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32ColumnBase, manyTypes.FindProperty("Enum32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32ArrayColumnBase, manyTypes.FindProperty("Enum32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32AsStringColumnBase, manyTypes.FindProperty("Enum32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32AsStringArrayColumnBase, manyTypes.FindProperty("Enum32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32AsStringCollectionColumnBase, manyTypes.FindProperty("Enum32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32CollectionColumnBase, manyTypes.FindProperty("Enum32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64ColumnBase, manyTypes.FindProperty("Enum64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64ArrayColumnBase, manyTypes.FindProperty("Enum64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64AsStringColumnBase, manyTypes.FindProperty("Enum64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64AsStringArrayColumnBase, manyTypes.FindProperty("Enum64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64AsStringCollectionColumnBase, manyTypes.FindProperty("Enum64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64CollectionColumnBase, manyTypes.FindProperty("Enum64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8ColumnBase, manyTypes.FindProperty("Enum8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8ArrayColumnBase, manyTypes.FindProperty("Enum8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8AsStringColumnBase, manyTypes.FindProperty("Enum8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8AsStringArrayColumnBase, manyTypes.FindProperty("Enum8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8AsStringCollectionColumnBase, manyTypes.FindProperty("Enum8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8CollectionColumnBase, manyTypes.FindProperty("Enum8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumToNumberConverterPropertyColumnBase, manyTypes.FindProperty("EnumToNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumToStringConverterPropertyColumnBase, manyTypes.FindProperty("EnumToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16ColumnBase, manyTypes.FindProperty("EnumU16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16ArrayColumnBase, manyTypes.FindProperty("EnumU16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16AsStringColumnBase, manyTypes.FindProperty("EnumU16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16AsStringArrayColumnBase, manyTypes.FindProperty("EnumU16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16CollectionColumnBase, manyTypes.FindProperty("EnumU16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32ColumnBase, manyTypes.FindProperty("EnumU32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32ArrayColumnBase, manyTypes.FindProperty("EnumU32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32AsStringColumnBase, manyTypes.FindProperty("EnumU32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32AsStringArrayColumnBase, manyTypes.FindProperty("EnumU32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32CollectionColumnBase, manyTypes.FindProperty("EnumU32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64ColumnBase, manyTypes.FindProperty("EnumU64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64ArrayColumnBase, manyTypes.FindProperty("EnumU64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64AsStringColumnBase, manyTypes.FindProperty("EnumU64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64AsStringArrayColumnBase, manyTypes.FindProperty("EnumU64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64CollectionColumnBase, manyTypes.FindProperty("EnumU64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8ColumnBase, manyTypes.FindProperty("EnumU8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8ArrayColumnBase, manyTypes.FindProperty("EnumU8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8AsStringColumnBase, manyTypes.FindProperty("EnumU8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8AsStringArrayColumnBase, manyTypes.FindProperty("EnumU8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8CollectionColumnBase, manyTypes.FindProperty("EnumU8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)floatColumnBase, manyTypes.FindProperty("Float")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)floatArrayColumnBase, manyTypes.FindProperty("FloatArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidColumnBase, manyTypes.FindProperty("Guid")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidArrayColumnBase, manyTypes.FindProperty("GuidArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidToBytesConverterPropertyColumnBase, manyTypes.FindProperty("GuidToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidToStringConverterPropertyColumnBase, manyTypes.FindProperty("GuidToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressColumnBase, manyTypes.FindProperty("IPAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressArrayColumnBase, manyTypes.FindProperty("IPAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressReadOnlyCollectionColumnBase, manyTypes.FindProperty("IPAddressReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressToBytesConverterPropertyColumnBase, manyTypes.FindProperty("IPAddressToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressToStringConverterPropertyColumnBase, manyTypes.FindProperty("IPAddressToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int16ColumnBase, manyTypes.FindProperty("Int16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int16ArrayColumnBase, manyTypes.FindProperty("Int16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int32ColumnBase, manyTypes.FindProperty("Int32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int32ArrayColumnBase, manyTypes.FindProperty("Int32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int32ReadOnlyCollectionColumnBase, manyTypes.FindProperty("Int32ReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int64ColumnBase, manyTypes.FindProperty("Int64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int64ArrayColumnBase, manyTypes.FindProperty("Int64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int8ColumnBase, manyTypes.FindProperty("Int8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int8ArrayColumnBase, manyTypes.FindProperty("Int8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)intNumberToBytesConverterPropertyColumnBase, manyTypes.FindProperty("IntNumberToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)intNumberToStringConverterPropertyColumnBase, manyTypes.FindProperty("IntNumberToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullIntToNullStringConverterPropertyColumnBase, manyTypes.FindProperty("NullIntToNullStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBoolColumnBase, manyTypes.FindProperty("NullableBool")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBoolArrayColumnBase, manyTypes.FindProperty("NullableBoolArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBytesColumnBase, manyTypes.FindProperty("NullableBytes")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBytesArrayColumnBase, manyTypes.FindProperty("NullableBytesArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableCharColumnBase, manyTypes.FindProperty("NullableChar")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableCharArrayColumnBase, manyTypes.FindProperty("NullableCharArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateOnlyColumnBase, manyTypes.FindProperty("NullableDateOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateOnlyArrayColumnBase, manyTypes.FindProperty("NullableDateOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateTimeColumnBase, manyTypes.FindProperty("NullableDateTime")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateTimeArrayColumnBase, manyTypes.FindProperty("NullableDateTimeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDecimalColumnBase, manyTypes.FindProperty("NullableDecimal")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDecimalArrayColumnBase, manyTypes.FindProperty("NullableDecimalArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDoubleColumnBase, manyTypes.FindProperty("NullableDouble")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDoubleArrayColumnBase, manyTypes.FindProperty("NullableDoubleArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16ColumnBase, manyTypes.FindProperty("NullableEnum16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16ArrayColumnBase, manyTypes.FindProperty("NullableEnum16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16AsStringColumnBase, manyTypes.FindProperty("NullableEnum16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16CollectionColumnBase, manyTypes.FindProperty("NullableEnum16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32ColumnBase, manyTypes.FindProperty("NullableEnum32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32ArrayColumnBase, manyTypes.FindProperty("NullableEnum32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32AsStringColumnBase, manyTypes.FindProperty("NullableEnum32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32CollectionColumnBase, manyTypes.FindProperty("NullableEnum32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64ColumnBase, manyTypes.FindProperty("NullableEnum64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64ArrayColumnBase, manyTypes.FindProperty("NullableEnum64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64AsStringColumnBase, manyTypes.FindProperty("NullableEnum64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64CollectionColumnBase, manyTypes.FindProperty("NullableEnum64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8ColumnBase, manyTypes.FindProperty("NullableEnum8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8ArrayColumnBase, manyTypes.FindProperty("NullableEnum8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8AsStringColumnBase, manyTypes.FindProperty("NullableEnum8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8CollectionColumnBase, manyTypes.FindProperty("NullableEnum8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16ColumnBase, manyTypes.FindProperty("NullableEnumU16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16ArrayColumnBase, manyTypes.FindProperty("NullableEnumU16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16AsStringColumnBase, manyTypes.FindProperty("NullableEnumU16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16CollectionColumnBase, manyTypes.FindProperty("NullableEnumU16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32ColumnBase, manyTypes.FindProperty("NullableEnumU32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32ArrayColumnBase, manyTypes.FindProperty("NullableEnumU32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32AsStringColumnBase, manyTypes.FindProperty("NullableEnumU32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32CollectionColumnBase, manyTypes.FindProperty("NullableEnumU32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64ColumnBase, manyTypes.FindProperty("NullableEnumU64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64ArrayColumnBase, manyTypes.FindProperty("NullableEnumU64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64AsStringColumnBase, manyTypes.FindProperty("NullableEnumU64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64CollectionColumnBase, manyTypes.FindProperty("NullableEnumU64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8ColumnBase, manyTypes.FindProperty("NullableEnumU8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8ArrayColumnBase, manyTypes.FindProperty("NullableEnumU8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8AsStringColumnBase, manyTypes.FindProperty("NullableEnumU8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8CollectionColumnBase, manyTypes.FindProperty("NullableEnumU8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableFloatColumnBase, manyTypes.FindProperty("NullableFloat")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableFloatArrayColumnBase, manyTypes.FindProperty("NullableFloatArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableGuidColumnBase, manyTypes.FindProperty("NullableGuid")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableGuidArrayColumnBase, manyTypes.FindProperty("NullableGuidArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableIPAddressColumnBase, manyTypes.FindProperty("NullableIPAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableIPAddressArrayColumnBase, manyTypes.FindProperty("NullableIPAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt16ColumnBase, manyTypes.FindProperty("NullableInt16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt16ArrayColumnBase, manyTypes.FindProperty("NullableInt16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt32ColumnBase, manyTypes.FindProperty("NullableInt32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt32ArrayColumnBase, manyTypes.FindProperty("NullableInt32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt64ColumnBase, manyTypes.FindProperty("NullableInt64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt64ArrayColumnBase, manyTypes.FindProperty("NullableInt64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt8ColumnBase, manyTypes.FindProperty("NullableInt8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt8ArrayColumnBase, manyTypes.FindProperty("NullableInt8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullablePhysicalAddressColumnBase, manyTypes.FindProperty("NullablePhysicalAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullablePhysicalAddressArrayColumnBase, manyTypes.FindProperty("NullablePhysicalAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableStringColumnBase, manyTypes.FindProperty("NullableString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableStringArrayColumnBase, manyTypes.FindProperty("NullableStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeOnlyColumnBase, manyTypes.FindProperty("NullableTimeOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeOnlyArrayColumnBase, manyTypes.FindProperty("NullableTimeOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeSpanColumnBase, manyTypes.FindProperty("NullableTimeSpan")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeSpanArrayColumnBase, manyTypes.FindProperty("NullableTimeSpanArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt16ColumnBase, manyTypes.FindProperty("NullableUInt16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt16ArrayColumnBase, manyTypes.FindProperty("NullableUInt16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt32ColumnBase, manyTypes.FindProperty("NullableUInt32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt32ArrayColumnBase, manyTypes.FindProperty("NullableUInt32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt64ColumnBase, manyTypes.FindProperty("NullableUInt64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt64ArrayColumnBase, manyTypes.FindProperty("NullableUInt64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt8ColumnBase, manyTypes.FindProperty("NullableUInt8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt8ArrayColumnBase, manyTypes.FindProperty("NullableUInt8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUriColumnBase, manyTypes.FindProperty("NullableUri")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUriArrayColumnBase, manyTypes.FindProperty("NullableUriArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressColumnBase, manyTypes.FindProperty("PhysicalAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressArrayColumnBase, manyTypes.FindProperty("PhysicalAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressToBytesConverterPropertyColumnBase, manyTypes.FindProperty("PhysicalAddressToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressToStringConverterPropertyColumnBase, manyTypes.FindProperty("PhysicalAddressToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringColumnBase, manyTypes.FindProperty("String")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringArrayColumnBase, manyTypes.FindProperty("StringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringReadOnlyCollectionColumnBase, manyTypes.FindProperty("StringReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToBoolConverterPropertyColumnBase, manyTypes.FindProperty("StringToBoolConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToBytesConverterPropertyColumnBase, manyTypes.FindProperty("StringToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToCharConverterPropertyColumnBase, manyTypes.FindProperty("StringToCharConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDateOnlyConverterPropertyColumnBase, manyTypes.FindProperty("StringToDateOnlyConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDateTimeConverterPropertyColumnBase, manyTypes.FindProperty("StringToDateTimeConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDateTimeOffsetConverterPropertyColumnBase, manyTypes.FindProperty("StringToDateTimeOffsetConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDecimalNumberConverterPropertyColumnBase, manyTypes.FindProperty("StringToDecimalNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDoubleNumberConverterPropertyColumnBase, manyTypes.FindProperty("StringToDoubleNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToEnumConverterPropertyColumnBase, manyTypes.FindProperty("StringToEnumConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToGuidConverterPropertyColumnBase, manyTypes.FindProperty("StringToGuidConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToIntNumberConverterPropertyColumnBase, manyTypes.FindProperty("StringToIntNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToTimeOnlyConverterPropertyColumnBase, manyTypes.FindProperty("StringToTimeOnlyConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToTimeSpanConverterPropertyColumnBase, manyTypes.FindProperty("StringToTimeSpanConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToUriConverterPropertyColumnBase, manyTypes.FindProperty("StringToUriConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyColumnBase, manyTypes.FindProperty("TimeOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyArrayColumnBase, manyTypes.FindProperty("TimeOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyToStringConverterPropertyColumnBase, manyTypes.FindProperty("TimeOnlyToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyToTicksConverterPropertyColumnBase, manyTypes.FindProperty("TimeOnlyToTicksConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanColumnBase, manyTypes.FindProperty("TimeSpan")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanArrayColumnBase, manyTypes.FindProperty("TimeSpanArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanToStringConverterPropertyColumnBase, manyTypes.FindProperty("TimeSpanToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanToTicksConverterPropertyColumnBase, manyTypes.FindProperty("TimeSpanToTicksConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt16ColumnBase, manyTypes.FindProperty("UInt16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt16ArrayColumnBase, manyTypes.FindProperty("UInt16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt32ColumnBase, manyTypes.FindProperty("UInt32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt32ArrayColumnBase, manyTypes.FindProperty("UInt32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt64ColumnBase, manyTypes.FindProperty("UInt64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt64ArrayColumnBase, manyTypes.FindProperty("UInt64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt8ColumnBase, manyTypes.FindProperty("UInt8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt8ArrayColumnBase, manyTypes.FindProperty("UInt8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt8ReadOnlyCollectionColumnBase, manyTypes.FindProperty("UInt8ReadOnlyCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uriColumnBase, manyTypes.FindProperty("Uri")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uriArrayColumnBase, manyTypes.FindProperty("UriArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uriToStringConverterPropertyColumnBase, manyTypes.FindProperty("UriToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+
+            var tableMappings1 = new List<TableMapping>();
+            manyTypes.SetRuntimeAnnotation("Relational:TableMappings", tableMappings1);
+            var manyTypesTable = new Table("ManyTypes", null, relationalModel);
+            var idColumn0 = new Column("Id", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("Id", idColumn0);
+            idColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(idColumn0);
+            idColumn0.AddAnnotation("Jet:Identity", "3, 2");
+            var boolColumn = new Column("Bool", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Bool", boolColumn);
+            boolColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<bool>(boolColumn);
+            var boolArrayColumn = new Column("BoolArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolArray", boolArrayColumn);
+            boolArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(boolArrayColumn);
+            var boolReadOnlyCollectionColumn = new Column("BoolReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolReadOnlyCollection", boolReadOnlyCollectionColumn);
+            boolReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(boolReadOnlyCollectionColumn);
+            var boolToStringConverterPropertyColumn = new Column("BoolToStringConverterProperty", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolToStringConverterProperty", boolToStringConverterPropertyColumn);
+            boolToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(boolToStringConverterPropertyColumn);
+            var boolToTwoValuesConverterPropertyColumn = new Column("BoolToTwoValuesConverterProperty", "byte", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolToTwoValuesConverterProperty", boolToTwoValuesConverterPropertyColumn);
+            boolToTwoValuesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(boolToTwoValuesConverterPropertyColumn);
+            var boolToZeroOneConverterPropertyColumn = new Column("BoolToZeroOneConverterProperty", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolToZeroOneConverterProperty", boolToZeroOneConverterPropertyColumn);
+            boolToZeroOneConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(boolToZeroOneConverterPropertyColumn);
+            var bytesColumn = new Column("Bytes", "longbinary", manyTypesTable);
+            manyTypesTable.Columns.Add("Bytes", bytesColumn);
+            bytesColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(bytesColumn);
+            var bytesArrayColumn = new Column("BytesArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("BytesArray", bytesArrayColumn);
+            bytesArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(bytesArrayColumn);
+            var bytesToStringConverterPropertyColumn = new Column("BytesToStringConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("BytesToStringConverterProperty", bytesToStringConverterPropertyColumn);
+            bytesToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(bytesToStringConverterPropertyColumn);
+            var castingConverterPropertyColumn = new Column("CastingConverterProperty", "decimal(18,2)", manyTypesTable);
+            manyTypesTable.Columns.Add("CastingConverterProperty", castingConverterPropertyColumn);
+            castingConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(castingConverterPropertyColumn);
+            var charColumn = new Column("Char", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("Char", charColumn);
+            charColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(charColumn);
+            var charArrayColumn = new Column("CharArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("CharArray", charArrayColumn);
+            charArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(charArrayColumn);
+            var charToStringConverterPropertyColumn = new Column("CharToStringConverterProperty", "char(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumn);
+            charToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(charToStringConverterPropertyColumn);
+            var dateOnlyColumn = new Column("DateOnly", "date", manyTypesTable);
+            manyTypesTable.Columns.Add("DateOnly", dateOnlyColumn);
+            dateOnlyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateOnly>(dateOnlyColumn);
+            var dateOnlyArrayColumn = new Column("DateOnlyArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateOnlyArray", dateOnlyArrayColumn);
+            dateOnlyArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateOnlyArrayColumn);
+            var dateOnlyToStringConverterPropertyColumn = new Column("DateOnlyToStringConverterProperty", "varchar(10)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateOnlyToStringConverterProperty", dateOnlyToStringConverterPropertyColumn);
+            dateOnlyToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateOnlyToStringConverterPropertyColumn);
+            var dateTimeColumn = new Column("DateTime", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTime", dateTimeColumn);
+            dateTimeColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTime>(dateTimeColumn);
+            var dateTimeArrayColumn = new Column("DateTimeArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeArray", dateTimeArrayColumn);
+            dateTimeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateTimeArrayColumn);
+            var dateTimeOffsetToBinaryConverterPropertyColumn = new Column("DateTimeOffsetToBinaryConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeOffsetToBinaryConverterProperty", dateTimeOffsetToBinaryConverterPropertyColumn);
+            dateTimeOffsetToBinaryConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(dateTimeOffsetToBinaryConverterPropertyColumn);
+            var dateTimeOffsetToBytesConverterPropertyColumn = new Column("DateTimeOffsetToBytesConverterProperty", "varbinary(12)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeOffsetToBytesConverterProperty", dateTimeOffsetToBytesConverterPropertyColumn);
+            dateTimeOffsetToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(dateTimeOffsetToBytesConverterPropertyColumn);
+            var dateTimeOffsetToStringConverterPropertyColumn = new Column("DateTimeOffsetToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeOffsetToStringConverterProperty", dateTimeOffsetToStringConverterPropertyColumn);
+            dateTimeOffsetToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateTimeOffsetToStringConverterPropertyColumn);
+            var dateTimeToBinaryConverterPropertyColumn = new Column("DateTimeToBinaryConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeToBinaryConverterProperty", dateTimeToBinaryConverterPropertyColumn);
+            dateTimeToBinaryConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(dateTimeToBinaryConverterPropertyColumn);
+            var dateTimeToStringConverterPropertyColumn = new Column("DateTimeToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeToStringConverterProperty", dateTimeToStringConverterPropertyColumn);
+            dateTimeToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dateTimeToStringConverterPropertyColumn);
+            var dateTimeToTicksConverterPropertyColumn = new Column("DateTimeToTicksConverterProperty", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeToTicksConverterProperty", dateTimeToTicksConverterPropertyColumn);
+            dateTimeToTicksConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTime>(dateTimeToTicksConverterPropertyColumn);
+            var decimalColumn = new Column("Decimal", "decimal(18,2)", manyTypesTable);
+            manyTypesTable.Columns.Add("Decimal", decimalColumn);
+            decimalColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(decimalColumn);
+            var decimalArrayColumn = new Column("DecimalArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("DecimalArray", decimalArrayColumn);
+            decimalArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(decimalArrayColumn);
+            var decimalNumberToBytesConverterPropertyColumn = new Column("DecimalNumberToBytesConverterProperty", "varbinary(16)", manyTypesTable);
+            manyTypesTable.Columns.Add("DecimalNumberToBytesConverterProperty", decimalNumberToBytesConverterPropertyColumn);
+            decimalNumberToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(decimalNumberToBytesConverterPropertyColumn);
+            var decimalNumberToStringConverterPropertyColumn = new Column("DecimalNumberToStringConverterProperty", "varchar(64)", manyTypesTable);
+            manyTypesTable.Columns.Add("DecimalNumberToStringConverterProperty", decimalNumberToStringConverterPropertyColumn);
+            decimalNumberToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(decimalNumberToStringConverterPropertyColumn);
+            var doubleColumn = new Column("Double", "double", manyTypesTable);
+            manyTypesTable.Columns.Add("Double", doubleColumn);
+            doubleColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<double>(doubleColumn);
+            var doubleArrayColumn = new Column("DoubleArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("DoubleArray", doubleArrayColumn);
+            doubleArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(doubleArrayColumn);
+            var doubleNumberToBytesConverterPropertyColumn = new Column("DoubleNumberToBytesConverterProperty", "varbinary(8)", manyTypesTable);
+            manyTypesTable.Columns.Add("DoubleNumberToBytesConverterProperty", doubleNumberToBytesConverterPropertyColumn);
+            doubleNumberToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(doubleNumberToBytesConverterPropertyColumn);
+            var doubleNumberToStringConverterPropertyColumn = new Column("DoubleNumberToStringConverterProperty", "varchar(64)", manyTypesTable);
+            manyTypesTable.Columns.Add("DoubleNumberToStringConverterProperty", doubleNumberToStringConverterPropertyColumn);
+            doubleNumberToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(doubleNumberToStringConverterPropertyColumn);
+            var enum16Column = new Column("Enum16", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16", enum16Column);
+            enum16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(enum16Column);
+            var enum16ArrayColumn = new Column("Enum16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16Array", enum16ArrayColumn);
+            enum16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16ArrayColumn);
+            var enum16AsStringColumn = new Column("Enum16AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16AsString", enum16AsStringColumn);
+            enum16AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16AsStringColumn);
+            var enum16AsStringArrayColumn = new Column("Enum16AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16AsStringArray", enum16AsStringArrayColumn);
+            enum16AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16AsStringArrayColumn);
+            var enum16AsStringCollectionColumn = new Column("Enum16AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16AsStringCollection", enum16AsStringCollectionColumn);
+            enum16AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16AsStringCollectionColumn);
+            var enum16CollectionColumn = new Column("Enum16Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16Collection", enum16CollectionColumn);
+            enum16CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum16CollectionColumn);
+            var enum32Column = new Column("Enum32", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32", enum32Column);
+            enum32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum32Column);
+            var enum32ArrayColumn = new Column("Enum32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32Array", enum32ArrayColumn);
+            enum32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32ArrayColumn);
+            var enum32AsStringColumn = new Column("Enum32AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32AsString", enum32AsStringColumn);
+            enum32AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32AsStringColumn);
+            var enum32AsStringArrayColumn = new Column("Enum32AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32AsStringArray", enum32AsStringArrayColumn);
+            enum32AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32AsStringArrayColumn);
+            var enum32AsStringCollectionColumn = new Column("Enum32AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32AsStringCollection", enum32AsStringCollectionColumn);
+            enum32AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32AsStringCollectionColumn);
+            var enum32CollectionColumn = new Column("Enum32Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32Collection", enum32CollectionColumn);
+            enum32CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum32CollectionColumn);
+            var enum64Column = new Column("Enum64", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64", enum64Column);
+            enum64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(enum64Column);
+            var enum64ArrayColumn = new Column("Enum64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64Array", enum64ArrayColumn);
+            enum64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64ArrayColumn);
+            var enum64AsStringColumn = new Column("Enum64AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64AsString", enum64AsStringColumn);
+            enum64AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64AsStringColumn);
+            var enum64AsStringArrayColumn = new Column("Enum64AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64AsStringArray", enum64AsStringArrayColumn);
+            enum64AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64AsStringArrayColumn);
+            var enum64AsStringCollectionColumn = new Column("Enum64AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64AsStringCollection", enum64AsStringCollectionColumn);
+            enum64AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64AsStringCollectionColumn);
+            var enum64CollectionColumn = new Column("Enum64Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64Collection", enum64CollectionColumn);
+            enum64CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum64CollectionColumn);
+            var enum8Column = new Column("Enum8", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8", enum8Column);
+            enum8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(enum8Column);
+            var enum8ArrayColumn = new Column("Enum8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8Array", enum8ArrayColumn);
+            enum8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8ArrayColumn);
+            var enum8AsStringColumn = new Column("Enum8AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8AsString", enum8AsStringColumn);
+            enum8AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8AsStringColumn);
+            var enum8AsStringArrayColumn = new Column("Enum8AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8AsStringArray", enum8AsStringArrayColumn);
+            enum8AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8AsStringArrayColumn);
+            var enum8AsStringCollectionColumn = new Column("Enum8AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8AsStringCollection", enum8AsStringCollectionColumn);
+            enum8AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8AsStringCollectionColumn);
+            var enum8CollectionColumn = new Column("Enum8Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8Collection", enum8CollectionColumn);
+            enum8CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enum8CollectionColumn);
+            var enumToNumberConverterPropertyColumn = new Column("EnumToNumberConverterProperty", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumToNumberConverterProperty", enumToNumberConverterPropertyColumn);
+            enumToNumberConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enumToNumberConverterPropertyColumn);
+            var enumToStringConverterPropertyColumn = new Column("EnumToStringConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumToStringConverterProperty", enumToStringConverterPropertyColumn);
+            enumToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumToStringConverterPropertyColumn);
+            var enumU16Column = new Column("EnumU16", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16", enumU16Column);
+            enumU16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enumU16Column);
+            var enumU16ArrayColumn = new Column("EnumU16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16Array", enumU16ArrayColumn);
+            enumU16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16ArrayColumn);
+            var enumU16AsStringColumn = new Column("EnumU16AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16AsString", enumU16AsStringColumn);
+            enumU16AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16AsStringColumn);
+            var enumU16AsStringArrayColumn = new Column("EnumU16AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16AsStringArray", enumU16AsStringArrayColumn);
+            enumU16AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16AsStringArrayColumn);
+            var enumU16AsStringCollectionColumn = new Column("EnumU16AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16AsStringCollection", enumU16AsStringCollectionColumn);
+            enumU16AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16AsStringCollectionColumn);
+            var enumU16CollectionColumn = new Column("EnumU16Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16Collection", enumU16CollectionColumn);
+            enumU16CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU16CollectionColumn);
+            var enumU32Column = new Column("EnumU32", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32", enumU32Column);
+            enumU32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(enumU32Column);
+            var enumU32ArrayColumn = new Column("EnumU32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32Array", enumU32ArrayColumn);
+            enumU32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32ArrayColumn);
+            var enumU32AsStringColumn = new Column("EnumU32AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32AsString", enumU32AsStringColumn);
+            enumU32AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32AsStringColumn);
+            var enumU32AsStringArrayColumn = new Column("EnumU32AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32AsStringArray", enumU32AsStringArrayColumn);
+            enumU32AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32AsStringArrayColumn);
+            var enumU32AsStringCollectionColumn = new Column("EnumU32AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32AsStringCollection", enumU32AsStringCollectionColumn);
+            enumU32AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32AsStringCollectionColumn);
+            var enumU32CollectionColumn = new Column("EnumU32Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32Collection", enumU32CollectionColumn);
+            enumU32CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU32CollectionColumn);
+            var enumU64Column = new Column("EnumU64", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64", enumU64Column);
+            enumU64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(enumU64Column);
+            var enumU64ArrayColumn = new Column("EnumU64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64Array", enumU64ArrayColumn);
+            enumU64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64ArrayColumn);
+            var enumU64AsStringColumn = new Column("EnumU64AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64AsString", enumU64AsStringColumn);
+            enumU64AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64AsStringColumn);
+            var enumU64AsStringArrayColumn = new Column("EnumU64AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64AsStringArray", enumU64AsStringArrayColumn);
+            enumU64AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64AsStringArrayColumn);
+            var enumU64AsStringCollectionColumn = new Column("EnumU64AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64AsStringCollection", enumU64AsStringCollectionColumn);
+            enumU64AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64AsStringCollectionColumn);
+            var enumU64CollectionColumn = new Column("EnumU64Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64Collection", enumU64CollectionColumn);
+            enumU64CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU64CollectionColumn);
+            var enumU8Column = new Column("EnumU8", "byte", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8", enumU8Column);
+            enumU8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(enumU8Column);
+            var enumU8ArrayColumn = new Column("EnumU8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8Array", enumU8ArrayColumn);
+            enumU8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8ArrayColumn);
+            var enumU8AsStringColumn = new Column("EnumU8AsString", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8AsString", enumU8AsStringColumn);
+            enumU8AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8AsStringColumn);
+            var enumU8AsStringArrayColumn = new Column("EnumU8AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8AsStringArray", enumU8AsStringArrayColumn);
+            enumU8AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8AsStringArrayColumn);
+            var enumU8AsStringCollectionColumn = new Column("EnumU8AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8AsStringCollection", enumU8AsStringCollectionColumn);
+            enumU8AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8AsStringCollectionColumn);
+            var enumU8CollectionColumn = new Column("EnumU8Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8Collection", enumU8CollectionColumn);
+            enumU8CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(enumU8CollectionColumn);
+            var floatColumn = new Column("Float", "single", manyTypesTable);
+            manyTypesTable.Columns.Add("Float", floatColumn);
+            floatColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<float>(floatColumn);
+            var floatArrayColumn = new Column("FloatArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("FloatArray", floatArrayColumn);
+            floatArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(floatArrayColumn);
+            var guidColumn = new Column("Guid", "uniqueidentifier", manyTypesTable);
+            manyTypesTable.Columns.Add("Guid", guidColumn);
+            guidColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(guidColumn);
+            var guidArrayColumn = new Column("GuidArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("GuidArray", guidArrayColumn);
+            guidArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(guidArrayColumn);
+            var guidToBytesConverterPropertyColumn = new Column("GuidToBytesConverterProperty", "varbinary(16)", manyTypesTable);
+            manyTypesTable.Columns.Add("GuidToBytesConverterProperty", guidToBytesConverterPropertyColumn);
+            guidToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(guidToBytesConverterPropertyColumn);
+            var guidToStringConverterPropertyColumn = new Column("GuidToStringConverterProperty", "varchar(36)", manyTypesTable);
+            manyTypesTable.Columns.Add("GuidToStringConverterProperty", guidToStringConverterPropertyColumn);
+            guidToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(guidToStringConverterPropertyColumn);
+            var iPAddressColumn = new Column("IPAddress", "varchar(45)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddress", iPAddressColumn);
+            iPAddressColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(iPAddressColumn);
+            var iPAddressArrayColumn = new Column("IPAddressArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressArray", iPAddressArrayColumn);
+            iPAddressArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(iPAddressArrayColumn);
+            var iPAddressReadOnlyCollectionColumn = new Column("IPAddressReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressReadOnlyCollection", iPAddressReadOnlyCollectionColumn);
+            iPAddressReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(iPAddressReadOnlyCollectionColumn);
+            var iPAddressToBytesConverterPropertyColumn = new Column("IPAddressToBytesConverterProperty", "varbinary(16)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressToBytesConverterProperty", iPAddressToBytesConverterPropertyColumn);
+            iPAddressToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(iPAddressToBytesConverterPropertyColumn);
+            var iPAddressToStringConverterPropertyColumn = new Column("IPAddressToStringConverterProperty", "varchar(45)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressToStringConverterProperty", iPAddressToStringConverterPropertyColumn);
+            iPAddressToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(iPAddressToStringConverterPropertyColumn);
+            var int16Column = new Column("Int16", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Int16", int16Column);
+            int16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(int16Column);
+            var int16ArrayColumn = new Column("Int16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int16Array", int16ArrayColumn);
+            int16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int16ArrayColumn);
+            var int32Column = new Column("Int32", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("Int32", int32Column);
+            int32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(int32Column);
+            var int32ArrayColumn = new Column("Int32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int32Array", int32ArrayColumn);
+            int32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int32ArrayColumn);
+            var int32ReadOnlyCollectionColumn = new Column("Int32ReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int32ReadOnlyCollection", int32ReadOnlyCollectionColumn);
+            int32ReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int32ReadOnlyCollectionColumn);
+            var int64Column = new Column("Int64", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int64", int64Column);
+            int64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(int64Column);
+            var int64ArrayColumn = new Column("Int64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int64Array", int64ArrayColumn);
+            int64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int64ArrayColumn);
+            var int8Column = new Column("Int8", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Int8", int8Column);
+            int8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(int8Column);
+            var int8ArrayColumn = new Column("Int8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Int8Array", int8ArrayColumn);
+            int8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(int8ArrayColumn);
+            var intNumberToBytesConverterPropertyColumn = new Column("IntNumberToBytesConverterProperty", "varbinary(4)", manyTypesTable);
+            manyTypesTable.Columns.Add("IntNumberToBytesConverterProperty", intNumberToBytesConverterPropertyColumn);
+            intNumberToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(intNumberToBytesConverterPropertyColumn);
+            var intNumberToStringConverterPropertyColumn = new Column("IntNumberToStringConverterProperty", "varchar(64)", manyTypesTable);
+            manyTypesTable.Columns.Add("IntNumberToStringConverterProperty", intNumberToStringConverterPropertyColumn);
+            intNumberToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(intNumberToStringConverterPropertyColumn);
+            var nullIntToNullStringConverterPropertyColumn = new Column("NullIntToNullStringConverterProperty", "varchar(255)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullIntToNullStringConverterProperty", nullIntToNullStringConverterPropertyColumn);
+            nullIntToNullStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullIntToNullStringConverterPropertyColumn);
+            var nullableBoolColumn = new Column("NullableBool", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableBool", nullableBoolColumn);
+            nullableBoolColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<bool>(nullableBoolColumn);
+            var nullableBoolArrayColumn = new Column("NullableBoolArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableBoolArray", nullableBoolArrayColumn);
+            nullableBoolArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableBoolArrayColumn);
+            var nullableBytesColumn = new Column("NullableBytes", "longbinary", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableBytes", nullableBytesColumn);
+            nullableBytesColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(nullableBytesColumn);
+            var nullableBytesArrayColumn = new Column("NullableBytesArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableBytesArray", nullableBytesArrayColumn);
+            nullableBytesArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableBytesArrayColumn);
+            var nullableCharColumn = new Column("NullableChar", "varchar(1)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableChar", nullableCharColumn);
+            nullableCharColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableCharColumn);
+            var nullableCharArrayColumn = new Column("NullableCharArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableCharArray", nullableCharArrayColumn);
+            nullableCharArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableCharArrayColumn);
+            var nullableDateOnlyColumn = new Column("NullableDateOnly", "date", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDateOnly", nullableDateOnlyColumn);
+            nullableDateOnlyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateOnly>(nullableDateOnlyColumn);
+            var nullableDateOnlyArrayColumn = new Column("NullableDateOnlyArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDateOnlyArray", nullableDateOnlyArrayColumn);
+            nullableDateOnlyArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableDateOnlyArrayColumn);
+            var nullableDateTimeColumn = new Column("NullableDateTime", "datetime", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDateTime", nullableDateTimeColumn);
+            nullableDateTimeColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTime>(nullableDateTimeColumn);
+            var nullableDateTimeArrayColumn = new Column("NullableDateTimeArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDateTimeArray", nullableDateTimeArrayColumn);
+            nullableDateTimeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableDateTimeArrayColumn);
+            var nullableDecimalColumn = new Column("NullableDecimal", "decimal(18,2)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDecimal", nullableDecimalColumn);
+            nullableDecimalColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(nullableDecimalColumn);
+            var nullableDecimalArrayColumn = new Column("NullableDecimalArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDecimalArray", nullableDecimalArrayColumn);
+            nullableDecimalArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableDecimalArrayColumn);
+            var nullableDoubleColumn = new Column("NullableDouble", "double", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDouble", nullableDoubleColumn);
+            nullableDoubleColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<double>(nullableDoubleColumn);
+            var nullableDoubleArrayColumn = new Column("NullableDoubleArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDoubleArray", nullableDoubleArrayColumn);
+            nullableDoubleArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableDoubleArrayColumn);
+            var nullableEnum16Column = new Column("NullableEnum16", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum16", nullableEnum16Column);
+            nullableEnum16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableEnum16Column);
+            var nullableEnum16ArrayColumn = new Column("NullableEnum16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16Array", nullableEnum16ArrayColumn);
+            nullableEnum16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum16ArrayColumn);
+            var nullableEnum16AsStringColumn = new Column("NullableEnum16AsString", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum16AsString", nullableEnum16AsStringColumn);
+            nullableEnum16AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableEnum16AsStringColumn);
+            var nullableEnum16AsStringArrayColumn = new Column("NullableEnum16AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16AsStringArray", nullableEnum16AsStringArrayColumn);
+            nullableEnum16AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum16AsStringArrayColumn);
+            var nullableEnum16AsStringCollectionColumn = new Column("NullableEnum16AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16AsStringCollection", nullableEnum16AsStringCollectionColumn);
+            nullableEnum16AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum16AsStringCollectionColumn);
+            var nullableEnum16CollectionColumn = new Column("NullableEnum16Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16Collection", nullableEnum16CollectionColumn);
+            nullableEnum16CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum16CollectionColumn);
+            var nullableEnum32Column = new Column("NullableEnum32", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum32", nullableEnum32Column);
+            nullableEnum32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableEnum32Column);
+            var nullableEnum32ArrayColumn = new Column("NullableEnum32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32Array", nullableEnum32ArrayColumn);
+            nullableEnum32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum32ArrayColumn);
+            var nullableEnum32AsStringColumn = new Column("NullableEnum32AsString", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum32AsString", nullableEnum32AsStringColumn);
+            nullableEnum32AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableEnum32AsStringColumn);
+            var nullableEnum32AsStringArrayColumn = new Column("NullableEnum32AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32AsStringArray", nullableEnum32AsStringArrayColumn);
+            nullableEnum32AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum32AsStringArrayColumn);
+            var nullableEnum32AsStringCollectionColumn = new Column("NullableEnum32AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32AsStringCollection", nullableEnum32AsStringCollectionColumn);
+            nullableEnum32AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum32AsStringCollectionColumn);
+            var nullableEnum32CollectionColumn = new Column("NullableEnum32Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32Collection", nullableEnum32CollectionColumn);
+            nullableEnum32CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum32CollectionColumn);
+            var nullableEnum64Column = new Column("NullableEnum64", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum64", nullableEnum64Column);
+            nullableEnum64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableEnum64Column);
+            var nullableEnum64ArrayColumn = new Column("NullableEnum64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64Array", nullableEnum64ArrayColumn);
+            nullableEnum64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum64ArrayColumn);
+            var nullableEnum64AsStringColumn = new Column("NullableEnum64AsString", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum64AsString", nullableEnum64AsStringColumn);
+            nullableEnum64AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableEnum64AsStringColumn);
+            var nullableEnum64AsStringArrayColumn = new Column("NullableEnum64AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64AsStringArray", nullableEnum64AsStringArrayColumn);
+            nullableEnum64AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum64AsStringArrayColumn);
+            var nullableEnum64AsStringCollectionColumn = new Column("NullableEnum64AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64AsStringCollection", nullableEnum64AsStringCollectionColumn);
+            nullableEnum64AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum64AsStringCollectionColumn);
+            var nullableEnum64CollectionColumn = new Column("NullableEnum64Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64Collection", nullableEnum64CollectionColumn);
+            nullableEnum64CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum64CollectionColumn);
+            var nullableEnum8Column = new Column("NullableEnum8", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum8", nullableEnum8Column);
+            nullableEnum8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableEnum8Column);
+            var nullableEnum8ArrayColumn = new Column("NullableEnum8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8Array", nullableEnum8ArrayColumn);
+            nullableEnum8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum8ArrayColumn);
+            var nullableEnum8AsStringColumn = new Column("NullableEnum8AsString", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum8AsString", nullableEnum8AsStringColumn);
+            nullableEnum8AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableEnum8AsStringColumn);
+            var nullableEnum8AsStringArrayColumn = new Column("NullableEnum8AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8AsStringArray", nullableEnum8AsStringArrayColumn);
+            nullableEnum8AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum8AsStringArrayColumn);
+            var nullableEnum8AsStringCollectionColumn = new Column("NullableEnum8AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8AsStringCollection", nullableEnum8AsStringCollectionColumn);
+            nullableEnum8AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum8AsStringCollectionColumn);
+            var nullableEnum8CollectionColumn = new Column("NullableEnum8Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8Collection", nullableEnum8CollectionColumn);
+            nullableEnum8CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnum8CollectionColumn);
+            var nullableEnumU16Column = new Column("NullableEnumU16", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU16", nullableEnumU16Column);
+            nullableEnumU16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableEnumU16Column);
+            var nullableEnumU16ArrayColumn = new Column("NullableEnumU16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16Array", nullableEnumU16ArrayColumn);
+            nullableEnumU16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU16ArrayColumn);
+            var nullableEnumU16AsStringColumn = new Column("NullableEnumU16AsString", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU16AsString", nullableEnumU16AsStringColumn);
+            nullableEnumU16AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableEnumU16AsStringColumn);
+            var nullableEnumU16AsStringArrayColumn = new Column("NullableEnumU16AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16AsStringArray", nullableEnumU16AsStringArrayColumn);
+            nullableEnumU16AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU16AsStringArrayColumn);
+            var nullableEnumU16AsStringCollectionColumn = new Column("NullableEnumU16AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16AsStringCollection", nullableEnumU16AsStringCollectionColumn);
+            nullableEnumU16AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU16AsStringCollectionColumn);
+            var nullableEnumU16CollectionColumn = new Column("NullableEnumU16Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16Collection", nullableEnumU16CollectionColumn);
+            nullableEnumU16CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU16CollectionColumn);
+            var nullableEnumU32Column = new Column("NullableEnumU32", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU32", nullableEnumU32Column);
+            nullableEnumU32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableEnumU32Column);
+            var nullableEnumU32ArrayColumn = new Column("NullableEnumU32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32Array", nullableEnumU32ArrayColumn);
+            nullableEnumU32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU32ArrayColumn);
+            var nullableEnumU32AsStringColumn = new Column("NullableEnumU32AsString", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU32AsString", nullableEnumU32AsStringColumn);
+            nullableEnumU32AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableEnumU32AsStringColumn);
+            var nullableEnumU32AsStringArrayColumn = new Column("NullableEnumU32AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32AsStringArray", nullableEnumU32AsStringArrayColumn);
+            nullableEnumU32AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU32AsStringArrayColumn);
+            var nullableEnumU32AsStringCollectionColumn = new Column("NullableEnumU32AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32AsStringCollection", nullableEnumU32AsStringCollectionColumn);
+            nullableEnumU32AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU32AsStringCollectionColumn);
+            var nullableEnumU32CollectionColumn = new Column("NullableEnumU32Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32Collection", nullableEnumU32CollectionColumn);
+            nullableEnumU32CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU32CollectionColumn);
+            var nullableEnumU64Column = new Column("NullableEnumU64", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU64", nullableEnumU64Column);
+            nullableEnumU64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(nullableEnumU64Column);
+            var nullableEnumU64ArrayColumn = new Column("NullableEnumU64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64Array", nullableEnumU64ArrayColumn);
+            nullableEnumU64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU64ArrayColumn);
+            var nullableEnumU64AsStringColumn = new Column("NullableEnumU64AsString", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU64AsString", nullableEnumU64AsStringColumn);
+            nullableEnumU64AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(nullableEnumU64AsStringColumn);
+            var nullableEnumU64AsStringArrayColumn = new Column("NullableEnumU64AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64AsStringArray", nullableEnumU64AsStringArrayColumn);
+            nullableEnumU64AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU64AsStringArrayColumn);
+            var nullableEnumU64AsStringCollectionColumn = new Column("NullableEnumU64AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64AsStringCollection", nullableEnumU64AsStringCollectionColumn);
+            nullableEnumU64AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU64AsStringCollectionColumn);
+            var nullableEnumU64CollectionColumn = new Column("NullableEnumU64Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64Collection", nullableEnumU64CollectionColumn);
+            nullableEnumU64CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU64CollectionColumn);
+            var nullableEnumU8Column = new Column("NullableEnumU8", "byte", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU8", nullableEnumU8Column);
+            nullableEnumU8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(nullableEnumU8Column);
+            var nullableEnumU8ArrayColumn = new Column("NullableEnumU8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8Array", nullableEnumU8ArrayColumn);
+            nullableEnumU8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU8ArrayColumn);
+            var nullableEnumU8AsStringColumn = new Column("NullableEnumU8AsString", "byte", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU8AsString", nullableEnumU8AsStringColumn);
+            nullableEnumU8AsStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(nullableEnumU8AsStringColumn);
+            var nullableEnumU8AsStringArrayColumn = new Column("NullableEnumU8AsStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8AsStringArray", nullableEnumU8AsStringArrayColumn);
+            nullableEnumU8AsStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU8AsStringArrayColumn);
+            var nullableEnumU8AsStringCollectionColumn = new Column("NullableEnumU8AsStringCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8AsStringCollection", nullableEnumU8AsStringCollectionColumn);
+            nullableEnumU8AsStringCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU8AsStringCollectionColumn);
+            var nullableEnumU8CollectionColumn = new Column("NullableEnumU8Collection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8Collection", nullableEnumU8CollectionColumn);
+            nullableEnumU8CollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableEnumU8CollectionColumn);
+            var nullableFloatColumn = new Column("NullableFloat", "single", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableFloat", nullableFloatColumn);
+            nullableFloatColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<float>(nullableFloatColumn);
+            var nullableFloatArrayColumn = new Column("NullableFloatArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableFloatArray", nullableFloatArrayColumn);
+            nullableFloatArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableFloatArrayColumn);
+            var nullableGuidColumn = new Column("NullableGuid", "uniqueidentifier", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableGuid", nullableGuidColumn);
+            nullableGuidColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(nullableGuidColumn);
+            var nullableGuidArrayColumn = new Column("NullableGuidArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableGuidArray", nullableGuidArrayColumn);
+            nullableGuidArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableGuidArrayColumn);
+            var nullableIPAddressColumn = new Column("NullableIPAddress", "varchar(45)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableIPAddress", nullableIPAddressColumn);
+            nullableIPAddressColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableIPAddressColumn);
+            var nullableIPAddressArrayColumn = new Column("NullableIPAddressArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableIPAddressArray", nullableIPAddressArrayColumn);
+            nullableIPAddressArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableIPAddressArrayColumn);
+            var nullableInt16Column = new Column("NullableInt16", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt16", nullableInt16Column);
+            nullableInt16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableInt16Column);
+            var nullableInt16ArrayColumn = new Column("NullableInt16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt16Array", nullableInt16ArrayColumn);
+            nullableInt16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableInt16ArrayColumn);
+            var nullableInt32Column = new Column("NullableInt32", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt32", nullableInt32Column);
+            nullableInt32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableInt32Column);
+            var nullableInt32ArrayColumn = new Column("NullableInt32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt32Array", nullableInt32ArrayColumn);
+            nullableInt32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableInt32ArrayColumn);
+            var nullableInt64Column = new Column("NullableInt64", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt64", nullableInt64Column);
+            nullableInt64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableInt64Column);
+            var nullableInt64ArrayColumn = new Column("NullableInt64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt64Array", nullableInt64ArrayColumn);
+            nullableInt64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableInt64ArrayColumn);
+            var nullableInt8Column = new Column("NullableInt8", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt8", nullableInt8Column);
+            nullableInt8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<short>(nullableInt8Column);
+            var nullableInt8ArrayColumn = new Column("NullableInt8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt8Array", nullableInt8ArrayColumn);
+            nullableInt8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableInt8ArrayColumn);
+            var nullablePhysicalAddressColumn = new Column("NullablePhysicalAddress", "varchar(20)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullablePhysicalAddress", nullablePhysicalAddressColumn);
+            nullablePhysicalAddressColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullablePhysicalAddressColumn);
+            var nullablePhysicalAddressArrayColumn = new Column("NullablePhysicalAddressArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullablePhysicalAddressArray", nullablePhysicalAddressArrayColumn);
+            nullablePhysicalAddressArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullablePhysicalAddressArrayColumn);
+            var nullableStringColumn = new Column("NullableString", "varchar(255)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableString", nullableStringColumn);
+            nullableStringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableStringColumn);
+            var nullableStringArrayColumn = new Column("NullableStringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableStringArray", nullableStringArrayColumn);
+            nullableStringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableStringArrayColumn);
+            var nullableTimeOnlyColumn = new Column("NullableTimeOnly", "time", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableTimeOnly", nullableTimeOnlyColumn);
+            nullableTimeOnlyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeOnly>(nullableTimeOnlyColumn);
+            var nullableTimeOnlyArrayColumn = new Column("NullableTimeOnlyArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableTimeOnlyArray", nullableTimeOnlyArrayColumn);
+            nullableTimeOnlyArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableTimeOnlyArrayColumn);
+            var nullableTimeSpanColumn = new Column("NullableTimeSpan", "datetime", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableTimeSpan", nullableTimeSpanColumn);
+            nullableTimeSpanColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeSpan>(nullableTimeSpanColumn);
+            var nullableTimeSpanArrayColumn = new Column("NullableTimeSpanArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableTimeSpanArray", nullableTimeSpanArrayColumn);
+            nullableTimeSpanArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableTimeSpanArrayColumn);
+            var nullableUInt16Column = new Column("NullableUInt16", "integer", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt16", nullableUInt16Column);
+            nullableUInt16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(nullableUInt16Column);
+            var nullableUInt16ArrayColumn = new Column("NullableUInt16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt16Array", nullableUInt16ArrayColumn);
+            nullableUInt16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUInt16ArrayColumn);
+            var nullableUInt32Column = new Column("NullableUInt32", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt32", nullableUInt32Column);
+            nullableUInt32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(nullableUInt32Column);
+            var nullableUInt32ArrayColumn = new Column("NullableUInt32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt32Array", nullableUInt32ArrayColumn);
+            nullableUInt32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUInt32ArrayColumn);
+            var nullableUInt64Column = new Column("NullableUInt64", "decimal(20,0)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt64", nullableUInt64Column);
+            nullableUInt64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(nullableUInt64Column);
+            var nullableUInt64ArrayColumn = new Column("NullableUInt64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt64Array", nullableUInt64ArrayColumn);
+            nullableUInt64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUInt64ArrayColumn);
+            var nullableUInt8Column = new Column("NullableUInt8", "byte", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt8", nullableUInt8Column);
+            nullableUInt8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(nullableUInt8Column);
+            var nullableUInt8ArrayColumn = new Column("NullableUInt8Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt8Array", nullableUInt8ArrayColumn);
+            nullableUInt8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUInt8ArrayColumn);
+            var nullableUriColumn = new Column("NullableUri", "varchar(255)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUri", nullableUriColumn);
+            nullableUriColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUriColumn);
+            var nullableUriArrayColumn = new Column("NullableUriArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUriArray", nullableUriArrayColumn);
+            nullableUriArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(nullableUriArrayColumn);
+            var physicalAddressColumn = new Column("PhysicalAddress", "varchar(20)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddress", physicalAddressColumn);
+            physicalAddressColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(physicalAddressColumn);
+            var physicalAddressArrayColumn = new Column("PhysicalAddressArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddressArray", physicalAddressArrayColumn);
+            physicalAddressArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(physicalAddressArrayColumn);
+            var physicalAddressToBytesConverterPropertyColumn = new Column("PhysicalAddressToBytesConverterProperty", "varbinary(8)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddressToBytesConverterProperty", physicalAddressToBytesConverterPropertyColumn);
+            physicalAddressToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(physicalAddressToBytesConverterPropertyColumn);
+            var physicalAddressToStringConverterPropertyColumn = new Column("PhysicalAddressToStringConverterProperty", "varchar(20)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddressToStringConverterProperty", physicalAddressToStringConverterPropertyColumn);
+            physicalAddressToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(physicalAddressToStringConverterPropertyColumn);
+            var stringColumn = new Column("String", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("String", stringColumn);
+            stringColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringColumn);
+            var stringArrayColumn = new Column("StringArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringArray", stringArrayColumn);
+            stringArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringArrayColumn);
+            var stringReadOnlyCollectionColumn = new Column("StringReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringReadOnlyCollection", stringReadOnlyCollectionColumn);
+            stringReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringReadOnlyCollectionColumn);
+            var stringToBoolConverterPropertyColumn = new Column("StringToBoolConverterProperty", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToBoolConverterProperty", stringToBoolConverterPropertyColumn);
+            stringToBoolConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<bool>(stringToBoolConverterPropertyColumn);
+            var stringToBytesConverterPropertyColumn = new Column("StringToBytesConverterProperty", "longbinary", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("StringToBytesConverterProperty", stringToBytesConverterPropertyColumn);
+            stringToBytesConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(stringToBytesConverterPropertyColumn);
+            var stringToCharConverterPropertyColumn = new Column("StringToCharConverterProperty", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToCharConverterProperty", stringToCharConverterPropertyColumn);
+            stringToCharConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringToCharConverterPropertyColumn);
+            var stringToDateOnlyConverterPropertyColumn = new Column("StringToDateOnlyConverterProperty", "date", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDateOnlyConverterProperty", stringToDateOnlyConverterPropertyColumn);
+            stringToDateOnlyConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateOnly>(stringToDateOnlyConverterPropertyColumn);
+            var stringToDateTimeConverterPropertyColumn = new Column("StringToDateTimeConverterProperty", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDateTimeConverterProperty", stringToDateTimeConverterPropertyColumn);
+            stringToDateTimeConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTime>(stringToDateTimeConverterPropertyColumn);
+            var stringToDateTimeOffsetConverterPropertyColumn = new Column("StringToDateTimeOffsetConverterProperty", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDateTimeOffsetConverterProperty", stringToDateTimeOffsetConverterPropertyColumn);
+            stringToDateTimeOffsetConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<DateTimeOffset>(stringToDateTimeOffsetConverterPropertyColumn);
+            var stringToDecimalNumberConverterPropertyColumn = new Column("StringToDecimalNumberConverterProperty", "decimal(18,2)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDecimalNumberConverterProperty", stringToDecimalNumberConverterPropertyColumn);
+            stringToDecimalNumberConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(stringToDecimalNumberConverterPropertyColumn);
+            var stringToDoubleNumberConverterPropertyColumn = new Column("StringToDoubleNumberConverterProperty", "double", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDoubleNumberConverterProperty", stringToDoubleNumberConverterPropertyColumn);
+            stringToDoubleNumberConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<double>(stringToDoubleNumberConverterPropertyColumn);
+            var stringToEnumConverterPropertyColumn = new Column("StringToEnumConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToEnumConverterProperty", stringToEnumConverterPropertyColumn);
+            stringToEnumConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(stringToEnumConverterPropertyColumn);
+            var stringToGuidConverterPropertyColumn = new Column("StringToGuidConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToGuidConverterProperty", stringToGuidConverterPropertyColumn);
+            stringToGuidConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringToGuidConverterPropertyColumn);
+            var stringToIntNumberConverterPropertyColumn = new Column("StringToIntNumberConverterProperty", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToIntNumberConverterProperty", stringToIntNumberConverterPropertyColumn);
+            stringToIntNumberConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(stringToIntNumberConverterPropertyColumn);
+            var stringToTimeOnlyConverterPropertyColumn = new Column("StringToTimeOnlyConverterProperty", "time", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToTimeOnlyConverterProperty", stringToTimeOnlyConverterPropertyColumn);
+            stringToTimeOnlyConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeOnly>(stringToTimeOnlyConverterPropertyColumn);
+            var stringToTimeSpanConverterPropertyColumn = new Column("StringToTimeSpanConverterProperty", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToTimeSpanConverterProperty", stringToTimeSpanConverterPropertyColumn);
+            stringToTimeSpanConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeSpan>(stringToTimeSpanConverterPropertyColumn);
+            var stringToUriConverterPropertyColumn = new Column("StringToUriConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToUriConverterProperty", stringToUriConverterPropertyColumn);
+            stringToUriConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(stringToUriConverterPropertyColumn);
+            var timeOnlyColumn = new Column("TimeOnly", "time", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnly", timeOnlyColumn);
+            timeOnlyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeOnly>(timeOnlyColumn);
+            var timeOnlyArrayColumn = new Column("TimeOnlyArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnlyArray", timeOnlyArrayColumn);
+            timeOnlyArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(timeOnlyArrayColumn);
+            var timeOnlyToStringConverterPropertyColumn = new Column("TimeOnlyToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnlyToStringConverterProperty", timeOnlyToStringConverterPropertyColumn);
+            timeOnlyToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(timeOnlyToStringConverterPropertyColumn);
+            var timeOnlyToTicksConverterPropertyColumn = new Column("TimeOnlyToTicksConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnlyToTicksConverterProperty", timeOnlyToTicksConverterPropertyColumn);
+            timeOnlyToTicksConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(timeOnlyToTicksConverterPropertyColumn);
+            var timeSpanColumn = new Column("TimeSpan", "datetime", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpan", timeSpanColumn);
+            timeSpanColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<TimeSpan>(timeSpanColumn);
+            var timeSpanArrayColumn = new Column("TimeSpanArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpanArray", timeSpanArrayColumn);
+            timeSpanArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(timeSpanArrayColumn);
+            var timeSpanToStringConverterPropertyColumn = new Column("TimeSpanToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpanToStringConverterProperty", timeSpanToStringConverterPropertyColumn);
+            timeSpanToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(timeSpanToStringConverterPropertyColumn);
+            var timeSpanToTicksConverterPropertyColumn = new Column("TimeSpanToTicksConverterProperty", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpanToTicksConverterProperty", timeSpanToTicksConverterPropertyColumn);
+            timeSpanToTicksConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(timeSpanToTicksConverterPropertyColumn);
+            var uInt16Column = new Column("UInt16", "integer", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt16", uInt16Column);
+            uInt16Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(uInt16Column);
+            var uInt16ArrayColumn = new Column("UInt16Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt16Array", uInt16ArrayColumn);
+            uInt16ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uInt16ArrayColumn);
+            var uInt32Column = new Column("UInt32", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt32", uInt32Column);
+            uInt32Column.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(uInt32Column);
+            var uInt32ArrayColumn = new Column("UInt32Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt32Array", uInt32ArrayColumn);
+            uInt32ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uInt32ArrayColumn);
+            var uInt64Column = new Column("UInt64", "decimal(20,0)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt64", uInt64Column);
+            uInt64Column.Accessors = ColumnAccessorsFactory.CreateGeneric<decimal>(uInt64Column);
+            var uInt64ArrayColumn = new Column("UInt64Array", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt64Array", uInt64ArrayColumn);
+            uInt64ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uInt64ArrayColumn);
+            var uInt8Column = new Column("UInt8", "byte", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt8", uInt8Column);
+            uInt8Column.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(uInt8Column);
+            var uInt8ArrayColumn = new Column("UInt8Array", "longbinary", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt8Array", uInt8ArrayColumn);
+            uInt8ArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(uInt8ArrayColumn);
+            var uInt8ReadOnlyCollectionColumn = new Column("UInt8ReadOnlyCollection", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt8ReadOnlyCollection", uInt8ReadOnlyCollectionColumn);
+            uInt8ReadOnlyCollectionColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uInt8ReadOnlyCollectionColumn);
+            var uriColumn = new Column("Uri", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("Uri", uriColumn);
+            uriColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uriColumn);
+            var uriArrayColumn = new Column("UriArray", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UriArray", uriArrayColumn);
+            uriArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uriArrayColumn);
+            var uriToStringConverterPropertyColumn = new Column("UriToStringConverterProperty", "varchar(255)", manyTypesTable);
+            manyTypesTable.Columns.Add("UriToStringConverterProperty", uriToStringConverterPropertyColumn);
+            uriToStringConverterPropertyColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(uriToStringConverterPropertyColumn);
+            relationalModel.Tables.Add(("ManyTypes", null), manyTypesTable);
+            var manyTypesTableMapping = new TableMapping(manyTypes, manyTypesTable, null);
+            manyTypesTable.AddTypeMapping(manyTypesTableMapping, false);
+            tableMappings1.Add(manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn0, manyTypes.FindProperty("Id")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolColumn, manyTypes.FindProperty("Bool")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolArrayColumn, manyTypes.FindProperty("BoolArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolReadOnlyCollectionColumn, manyTypes.FindProperty("BoolReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolToStringConverterPropertyColumn, manyTypes.FindProperty("BoolToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolToTwoValuesConverterPropertyColumn, manyTypes.FindProperty("BoolToTwoValuesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolToZeroOneConverterPropertyColumn, manyTypes.FindProperty("BoolToZeroOneConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(bytesColumn, manyTypes.FindProperty("Bytes")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(bytesArrayColumn, manyTypes.FindProperty("BytesArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(bytesToStringConverterPropertyColumn, manyTypes.FindProperty("BytesToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(castingConverterPropertyColumn, manyTypes.FindProperty("CastingConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(charColumn, manyTypes.FindProperty("Char")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(charArrayColumn, manyTypes.FindProperty("CharArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(charToStringConverterPropertyColumn, manyTypes.FindProperty("CharToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateOnlyColumn, manyTypes.FindProperty("DateOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateOnlyArrayColumn, manyTypes.FindProperty("DateOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateOnlyToStringConverterPropertyColumn, manyTypes.FindProperty("DateOnlyToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeColumn, manyTypes.FindProperty("DateTime")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeArrayColumn, manyTypes.FindProperty("DateTimeArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeOffsetToBinaryConverterPropertyColumn, manyTypes.FindProperty("DateTimeOffsetToBinaryConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeOffsetToBytesConverterPropertyColumn, manyTypes.FindProperty("DateTimeOffsetToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeOffsetToStringConverterPropertyColumn, manyTypes.FindProperty("DateTimeOffsetToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeToBinaryConverterPropertyColumn, manyTypes.FindProperty("DateTimeToBinaryConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeToStringConverterPropertyColumn, manyTypes.FindProperty("DateTimeToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeToTicksConverterPropertyColumn, manyTypes.FindProperty("DateTimeToTicksConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalColumn, manyTypes.FindProperty("Decimal")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalArrayColumn, manyTypes.FindProperty("DecimalArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalNumberToBytesConverterPropertyColumn, manyTypes.FindProperty("DecimalNumberToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalNumberToStringConverterPropertyColumn, manyTypes.FindProperty("DecimalNumberToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleColumn, manyTypes.FindProperty("Double")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleArrayColumn, manyTypes.FindProperty("DoubleArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleNumberToBytesConverterPropertyColumn, manyTypes.FindProperty("DoubleNumberToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleNumberToStringConverterPropertyColumn, manyTypes.FindProperty("DoubleNumberToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16Column, manyTypes.FindProperty("Enum16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16ArrayColumn, manyTypes.FindProperty("Enum16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16AsStringColumn, manyTypes.FindProperty("Enum16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16AsStringArrayColumn, manyTypes.FindProperty("Enum16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16AsStringCollectionColumn, manyTypes.FindProperty("Enum16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16CollectionColumn, manyTypes.FindProperty("Enum16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32Column, manyTypes.FindProperty("Enum32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32ArrayColumn, manyTypes.FindProperty("Enum32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32AsStringColumn, manyTypes.FindProperty("Enum32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32AsStringArrayColumn, manyTypes.FindProperty("Enum32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32AsStringCollectionColumn, manyTypes.FindProperty("Enum32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32CollectionColumn, manyTypes.FindProperty("Enum32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64Column, manyTypes.FindProperty("Enum64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64ArrayColumn, manyTypes.FindProperty("Enum64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64AsStringColumn, manyTypes.FindProperty("Enum64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64AsStringArrayColumn, manyTypes.FindProperty("Enum64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64AsStringCollectionColumn, manyTypes.FindProperty("Enum64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64CollectionColumn, manyTypes.FindProperty("Enum64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8Column, manyTypes.FindProperty("Enum8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8ArrayColumn, manyTypes.FindProperty("Enum8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8AsStringColumn, manyTypes.FindProperty("Enum8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8AsStringArrayColumn, manyTypes.FindProperty("Enum8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8AsStringCollectionColumn, manyTypes.FindProperty("Enum8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8CollectionColumn, manyTypes.FindProperty("Enum8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumToNumberConverterPropertyColumn, manyTypes.FindProperty("EnumToNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumToStringConverterPropertyColumn, manyTypes.FindProperty("EnumToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16Column, manyTypes.FindProperty("EnumU16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16ArrayColumn, manyTypes.FindProperty("EnumU16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16AsStringColumn, manyTypes.FindProperty("EnumU16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16AsStringArrayColumn, manyTypes.FindProperty("EnumU16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16AsStringCollectionColumn, manyTypes.FindProperty("EnumU16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16CollectionColumn, manyTypes.FindProperty("EnumU16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32Column, manyTypes.FindProperty("EnumU32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32ArrayColumn, manyTypes.FindProperty("EnumU32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32AsStringColumn, manyTypes.FindProperty("EnumU32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32AsStringArrayColumn, manyTypes.FindProperty("EnumU32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32AsStringCollectionColumn, manyTypes.FindProperty("EnumU32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32CollectionColumn, manyTypes.FindProperty("EnumU32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64Column, manyTypes.FindProperty("EnumU64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64ArrayColumn, manyTypes.FindProperty("EnumU64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64AsStringColumn, manyTypes.FindProperty("EnumU64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64AsStringArrayColumn, manyTypes.FindProperty("EnumU64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64AsStringCollectionColumn, manyTypes.FindProperty("EnumU64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64CollectionColumn, manyTypes.FindProperty("EnumU64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8Column, manyTypes.FindProperty("EnumU8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8ArrayColumn, manyTypes.FindProperty("EnumU8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8AsStringColumn, manyTypes.FindProperty("EnumU8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8AsStringArrayColumn, manyTypes.FindProperty("EnumU8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8AsStringCollectionColumn, manyTypes.FindProperty("EnumU8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8CollectionColumn, manyTypes.FindProperty("EnumU8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(floatColumn, manyTypes.FindProperty("Float")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(floatArrayColumn, manyTypes.FindProperty("FloatArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidColumn, manyTypes.FindProperty("Guid")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidArrayColumn, manyTypes.FindProperty("GuidArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidToBytesConverterPropertyColumn, manyTypes.FindProperty("GuidToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidToStringConverterPropertyColumn, manyTypes.FindProperty("GuidToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressColumn, manyTypes.FindProperty("IPAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressArrayColumn, manyTypes.FindProperty("IPAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressReadOnlyCollectionColumn, manyTypes.FindProperty("IPAddressReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressToBytesConverterPropertyColumn, manyTypes.FindProperty("IPAddressToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressToStringConverterPropertyColumn, manyTypes.FindProperty("IPAddressToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int16Column, manyTypes.FindProperty("Int16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int16ArrayColumn, manyTypes.FindProperty("Int16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int32Column, manyTypes.FindProperty("Int32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int32ArrayColumn, manyTypes.FindProperty("Int32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int32ReadOnlyCollectionColumn, manyTypes.FindProperty("Int32ReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int64Column, manyTypes.FindProperty("Int64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int64ArrayColumn, manyTypes.FindProperty("Int64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int8Column, manyTypes.FindProperty("Int8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int8ArrayColumn, manyTypes.FindProperty("Int8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(intNumberToBytesConverterPropertyColumn, manyTypes.FindProperty("IntNumberToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(intNumberToStringConverterPropertyColumn, manyTypes.FindProperty("IntNumberToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullIntToNullStringConverterPropertyColumn, manyTypes.FindProperty("NullIntToNullStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBoolColumn, manyTypes.FindProperty("NullableBool")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBoolArrayColumn, manyTypes.FindProperty("NullableBoolArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBytesColumn, manyTypes.FindProperty("NullableBytes")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBytesArrayColumn, manyTypes.FindProperty("NullableBytesArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableCharColumn, manyTypes.FindProperty("NullableChar")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableCharArrayColumn, manyTypes.FindProperty("NullableCharArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateOnlyColumn, manyTypes.FindProperty("NullableDateOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateOnlyArrayColumn, manyTypes.FindProperty("NullableDateOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateTimeColumn, manyTypes.FindProperty("NullableDateTime")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateTimeArrayColumn, manyTypes.FindProperty("NullableDateTimeArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDecimalColumn, manyTypes.FindProperty("NullableDecimal")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDecimalArrayColumn, manyTypes.FindProperty("NullableDecimalArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDoubleColumn, manyTypes.FindProperty("NullableDouble")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDoubleArrayColumn, manyTypes.FindProperty("NullableDoubleArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16Column, manyTypes.FindProperty("NullableEnum16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16ArrayColumn, manyTypes.FindProperty("NullableEnum16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16AsStringColumn, manyTypes.FindProperty("NullableEnum16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16AsStringArrayColumn, manyTypes.FindProperty("NullableEnum16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16CollectionColumn, manyTypes.FindProperty("NullableEnum16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32Column, manyTypes.FindProperty("NullableEnum32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32ArrayColumn, manyTypes.FindProperty("NullableEnum32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32AsStringColumn, manyTypes.FindProperty("NullableEnum32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32AsStringArrayColumn, manyTypes.FindProperty("NullableEnum32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32CollectionColumn, manyTypes.FindProperty("NullableEnum32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64Column, manyTypes.FindProperty("NullableEnum64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64ArrayColumn, manyTypes.FindProperty("NullableEnum64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64AsStringColumn, manyTypes.FindProperty("NullableEnum64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64AsStringArrayColumn, manyTypes.FindProperty("NullableEnum64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64CollectionColumn, manyTypes.FindProperty("NullableEnum64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8Column, manyTypes.FindProperty("NullableEnum8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8ArrayColumn, manyTypes.FindProperty("NullableEnum8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8AsStringColumn, manyTypes.FindProperty("NullableEnum8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8AsStringArrayColumn, manyTypes.FindProperty("NullableEnum8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8CollectionColumn, manyTypes.FindProperty("NullableEnum8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16Column, manyTypes.FindProperty("NullableEnumU16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16ArrayColumn, manyTypes.FindProperty("NullableEnumU16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16AsStringColumn, manyTypes.FindProperty("NullableEnumU16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16CollectionColumn, manyTypes.FindProperty("NullableEnumU16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32Column, manyTypes.FindProperty("NullableEnumU32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32ArrayColumn, manyTypes.FindProperty("NullableEnumU32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32AsStringColumn, manyTypes.FindProperty("NullableEnumU32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32CollectionColumn, manyTypes.FindProperty("NullableEnumU32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64Column, manyTypes.FindProperty("NullableEnumU64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64ArrayColumn, manyTypes.FindProperty("NullableEnumU64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64AsStringColumn, manyTypes.FindProperty("NullableEnumU64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64CollectionColumn, manyTypes.FindProperty("NullableEnumU64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8Column, manyTypes.FindProperty("NullableEnumU8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8ArrayColumn, manyTypes.FindProperty("NullableEnumU8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8AsStringColumn, manyTypes.FindProperty("NullableEnumU8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8CollectionColumn, manyTypes.FindProperty("NullableEnumU8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableFloatColumn, manyTypes.FindProperty("NullableFloat")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableFloatArrayColumn, manyTypes.FindProperty("NullableFloatArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableGuidColumn, manyTypes.FindProperty("NullableGuid")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableGuidArrayColumn, manyTypes.FindProperty("NullableGuidArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableIPAddressColumn, manyTypes.FindProperty("NullableIPAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableIPAddressArrayColumn, manyTypes.FindProperty("NullableIPAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt16Column, manyTypes.FindProperty("NullableInt16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt16ArrayColumn, manyTypes.FindProperty("NullableInt16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt32Column, manyTypes.FindProperty("NullableInt32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt32ArrayColumn, manyTypes.FindProperty("NullableInt32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt64Column, manyTypes.FindProperty("NullableInt64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt64ArrayColumn, manyTypes.FindProperty("NullableInt64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt8Column, manyTypes.FindProperty("NullableInt8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt8ArrayColumn, manyTypes.FindProperty("NullableInt8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullablePhysicalAddressColumn, manyTypes.FindProperty("NullablePhysicalAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullablePhysicalAddressArrayColumn, manyTypes.FindProperty("NullablePhysicalAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableStringColumn, manyTypes.FindProperty("NullableString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableStringArrayColumn, manyTypes.FindProperty("NullableStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeOnlyColumn, manyTypes.FindProperty("NullableTimeOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeOnlyArrayColumn, manyTypes.FindProperty("NullableTimeOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeSpanColumn, manyTypes.FindProperty("NullableTimeSpan")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeSpanArrayColumn, manyTypes.FindProperty("NullableTimeSpanArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt16Column, manyTypes.FindProperty("NullableUInt16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt16ArrayColumn, manyTypes.FindProperty("NullableUInt16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt32Column, manyTypes.FindProperty("NullableUInt32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt32ArrayColumn, manyTypes.FindProperty("NullableUInt32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt64Column, manyTypes.FindProperty("NullableUInt64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt64ArrayColumn, manyTypes.FindProperty("NullableUInt64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt8Column, manyTypes.FindProperty("NullableUInt8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt8ArrayColumn, manyTypes.FindProperty("NullableUInt8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUriColumn, manyTypes.FindProperty("NullableUri")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUriArrayColumn, manyTypes.FindProperty("NullableUriArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressColumn, manyTypes.FindProperty("PhysicalAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressArrayColumn, manyTypes.FindProperty("PhysicalAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressToBytesConverterPropertyColumn, manyTypes.FindProperty("PhysicalAddressToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressToStringConverterPropertyColumn, manyTypes.FindProperty("PhysicalAddressToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringColumn, manyTypes.FindProperty("String")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringArrayColumn, manyTypes.FindProperty("StringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringReadOnlyCollectionColumn, manyTypes.FindProperty("StringReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToBoolConverterPropertyColumn, manyTypes.FindProperty("StringToBoolConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToBytesConverterPropertyColumn, manyTypes.FindProperty("StringToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToCharConverterPropertyColumn, manyTypes.FindProperty("StringToCharConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDateOnlyConverterPropertyColumn, manyTypes.FindProperty("StringToDateOnlyConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDateTimeConverterPropertyColumn, manyTypes.FindProperty("StringToDateTimeConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDateTimeOffsetConverterPropertyColumn, manyTypes.FindProperty("StringToDateTimeOffsetConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDecimalNumberConverterPropertyColumn, manyTypes.FindProperty("StringToDecimalNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDoubleNumberConverterPropertyColumn, manyTypes.FindProperty("StringToDoubleNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToEnumConverterPropertyColumn, manyTypes.FindProperty("StringToEnumConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToGuidConverterPropertyColumn, manyTypes.FindProperty("StringToGuidConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToIntNumberConverterPropertyColumn, manyTypes.FindProperty("StringToIntNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToTimeOnlyConverterPropertyColumn, manyTypes.FindProperty("StringToTimeOnlyConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToTimeSpanConverterPropertyColumn, manyTypes.FindProperty("StringToTimeSpanConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToUriConverterPropertyColumn, manyTypes.FindProperty("StringToUriConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyColumn, manyTypes.FindProperty("TimeOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyArrayColumn, manyTypes.FindProperty("TimeOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyToStringConverterPropertyColumn, manyTypes.FindProperty("TimeOnlyToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyToTicksConverterPropertyColumn, manyTypes.FindProperty("TimeOnlyToTicksConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanColumn, manyTypes.FindProperty("TimeSpan")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanArrayColumn, manyTypes.FindProperty("TimeSpanArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanToStringConverterPropertyColumn, manyTypes.FindProperty("TimeSpanToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanToTicksConverterPropertyColumn, manyTypes.FindProperty("TimeSpanToTicksConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt16Column, manyTypes.FindProperty("UInt16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt16ArrayColumn, manyTypes.FindProperty("UInt16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt32Column, manyTypes.FindProperty("UInt32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt32ArrayColumn, manyTypes.FindProperty("UInt32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt64Column, manyTypes.FindProperty("UInt64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt64ArrayColumn, manyTypes.FindProperty("UInt64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt8Column, manyTypes.FindProperty("UInt8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt8ArrayColumn, manyTypes.FindProperty("UInt8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt8ReadOnlyCollectionColumn, manyTypes.FindProperty("UInt8ReadOnlyCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uriColumn, manyTypes.FindProperty("Uri")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uriArrayColumn, manyTypes.FindProperty("UriArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uriToStringConverterPropertyColumn, manyTypes.FindProperty("UriToStringConverterProperty")!, manyTypesTableMapping);
+            var pK_ManyTypes = new UniqueConstraint("PK_ManyTypes", manyTypesTable, new[] { idColumn0 });
+            manyTypesTable.PrimaryKey = pK_ManyTypes;
+            pK_ManyTypes.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<int>(pK_ManyTypes));
+            var pK_ManyTypesKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes",
+                new[] { "Id" });
+            pK_ManyTypes.MappedKeys.Add(pK_ManyTypesKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_ManyTypesKey).Add(pK_ManyTypes);
+            manyTypesTable.UniqueConstraints.Add("PK_ManyTypes", pK_ManyTypes);
+
+            var principalBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase")!;
+
+            var defaultTableMappings2 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings2);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", null, relationalModel);
+            var alternateIdColumnBase = new ColumnBase<ColumnMappingBase>("AlternateId", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("AlternateId", alternateIdColumnBase);
+            var discriminatorColumnBase = new ColumnBase<ColumnMappingBase>("Discriminator", "varchar(55)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Discriminator", discriminatorColumnBase);
+            var enum1ColumnBase = new ColumnBase<ColumnMappingBase>("Enum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum1", enum1ColumnBase);
+            var enum2ColumnBase = new ColumnBase<ColumnMappingBase>("Enum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum2", enum2ColumnBase);
+            var flagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum1", flagsEnum1ColumnBase);
+            var flagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum2", flagsEnum2ColumnBase);
+            var idColumnBase1 = new ColumnBase<ColumnMappingBase>("Id", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Id", idColumnBase1);
+            var manyOwnedColumnBase = new JsonColumnBase("ManyOwned", "longchar", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned", manyOwnedColumnBase);
+            var ownedColumnBase = new JsonColumnBase("Owned", "longchar", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned", ownedColumnBase);
+            var refTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase);
+            var refTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase);
+            var refTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase);
+            var refTypeListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeList", refTypeListColumnBase);
+            var valueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase);
+            var valueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase);
+            var valueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase);
+            var valueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase = new TableMappingBase<ColumnMappingBase>(principalBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase, false);
+            defaultTableMappings2.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)alternateIdColumnBase, principalBase.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase1, principalBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)discriminatorColumnBase, principalBase.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalBase.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalBase.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalBase.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalBase.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalBase.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalBase.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalBase.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalBase.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalBase.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalBase.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalBase.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalBase.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+
+            var tableMappings2 = new List<TableMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings2);
+            var principalBaseTable = new Table("PrincipalBase", null, relationalModel);
+            var idColumn1 = new Column("Id", "decimal(20,0)", principalBaseTable);
+            principalBaseTable.Columns.Add("Id", idColumn1);
+            idColumn1.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(idColumn1);
+            var alternateIdColumn = new Column("AlternateId", "uniqueidentifier", principalBaseTable);
+            principalBaseTable.Columns.Add("AlternateId", alternateIdColumn);
+            alternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(alternateIdColumn);
+            var discriminatorColumn = new Column("Discriminator", "varchar(55)", principalBaseTable);
+            principalBaseTable.Columns.Add("Discriminator", discriminatorColumn);
+            discriminatorColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(discriminatorColumn);
+            var enum1Column = new Column("Enum1", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("Enum1", enum1Column);
+            enum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum1Column);
+            var enum2Column = new Column("Enum2", "integer", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Enum2", enum2Column);
+            enum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum2Column);
+            var flagsEnum1Column = new Column("FlagsEnum1", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum1", flagsEnum1Column);
+            flagsEnum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum1Column);
+            var flagsEnum2Column = new Column("FlagsEnum2", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum2", flagsEnum2Column);
+            flagsEnum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum2Column);
+            var manyOwnedColumn = new JsonColumn("ManyOwned", "longchar", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ManyOwned", manyOwnedColumn);
+            manyOwnedColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<JsonElement>(manyOwnedColumn);
+            var ownedColumn = new JsonColumn("Owned", "longchar", principalBaseTable);
+            principalBaseTable.Columns.Add("Owned", ownedColumn);
+            ownedColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<JsonElement>(ownedColumn);
+            var refTypeArrayColumn = new Column("RefTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeArray", refTypeArrayColumn);
+            refTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeArrayColumn);
+            var refTypeEnumerableColumn = new Column("RefTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn);
+            refTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeEnumerableColumn);
+            var refTypeIListColumn = new Column("RefTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeIList", refTypeIListColumn);
+            refTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeIListColumn);
+            var refTypeListColumn = new Column("RefTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeList", refTypeListColumn);
+            refTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeListColumn);
+            var valueTypeArrayColumn = new Column("ValueTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn);
+            valueTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeArrayColumn);
+            var valueTypeEnumerableColumn = new Column("ValueTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn);
+            valueTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeEnumerableColumn);
+            var valueTypeIListColumn = new Column("ValueTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeIList", valueTypeIListColumn);
+            valueTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeIListColumn);
+            var valueTypeListColumn = new Column("ValueTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeList", valueTypeListColumn);
+            valueTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeListColumn);
+            relationalModel.Tables.Add(("PrincipalBase", null), principalBaseTable);
+            var principalBaseTableMapping = new TableMapping(principalBase, principalBaseTable, true)
+            {
+                IsSharedTablePrincipal = true,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping, false);
+            tableMappings2.Add(principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(alternateIdColumn, principalBase.FindProperty("AlternateId")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn1, principalBase.FindProperty("Id")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(discriminatorColumn, principalBase.FindProperty("Discriminator")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum1Column, principalBase.FindProperty("Enum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum2Column, principalBase.FindProperty("Enum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalBase.FindProperty("FlagsEnum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalBase.FindProperty("FlagsEnum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalBase.FindProperty("RefTypeList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseTableMapping);
+
+            var ownedType = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType")!;
+
+            var defaultTableMappings3 = new List<TableMappingBase<ColumnMappingBase>>();
+            ownedType.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings3);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0 = new TableMappingBase<ColumnMappingBase>(ownedType, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0, null);
+            defaultTableMappings3.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+
+            var tableMappings3 = new List<TableMapping>();
+            ownedType.SetRuntimeAnnotation("Relational:TableMappings", tableMappings3);
+            var principalBaseTableMapping0 = new TableMapping(ownedType, principalBaseTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping0, null);
+            tableMappings3.Add(principalBaseTableMapping0);
+            principalBaseTable.AddRowInternalForeignKey(ownedType, RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" }));
+
+            var principalDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>")!;
+
+            var defaultTableMappings4 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings4);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1 = new TableMappingBase<ColumnMappingBase>(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1, false);
+            defaultTableMappings4.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)alternateIdColumnBase, principalDerived.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase1, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)discriminatorColumnBase, principalDerived.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalDerived.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalDerived.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalDerived.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalDerived.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalDerived.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalDerived.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalDerived.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalDerived.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalDerived.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalDerived.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalDerived.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalDerived.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+
+            var tableMappings4 = new List<TableMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings4);
+            var principalBaseTableMapping1 = new TableMapping(principalDerived, principalBaseTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping1, false);
+            tableMappings4.Add(principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(alternateIdColumn, principalDerived.FindProperty("AlternateId")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(idColumn1, principalDerived.FindProperty("Id")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(discriminatorColumn, principalDerived.FindProperty("Discriminator")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(enum1Column, principalDerived.FindProperty("Enum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(enum2Column, principalDerived.FindProperty("Enum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalDerived.FindProperty("FlagsEnum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalDerived.FindProperty("FlagsEnum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalDerived.FindProperty("RefTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalDerived.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalDerived.FindProperty("RefTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalDerived.FindProperty("RefTypeList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalDerived.FindProperty("ValueTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalDerived.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalDerived.FindProperty("ValueTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalDerived.FindProperty("ValueTypeList")!, principalBaseTableMapping1);
+
+            var ownedType0 = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType")!;
+
+            var defaultTableMappings5 = new List<TableMappingBase<ColumnMappingBase>>();
+            ownedType0.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings5);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2 = new TableMappingBase<ColumnMappingBase>(ownedType0, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2, null);
+            defaultTableMappings5.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+
+            var tableMappings5 = new List<TableMapping>();
+            ownedType0.SetRuntimeAnnotation("Relational:TableMappings", tableMappings5);
+            var principalBaseTableMapping2 = new TableMapping(ownedType0, principalBaseTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping2, null);
+            tableMappings5.Add(principalBaseTableMapping2);
+            principalBaseTable.AddRowInternalForeignKey(ownedType0, RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType",
+                new[] { "PrincipalDerivedId", "PrincipalDerivedAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" }));
+            var aK_PrincipalBase_Id = new UniqueConstraint("AK_PrincipalBase_Id", principalBaseTable, new[] { idColumn1 });
+            aK_PrincipalBase_Id.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<long>(aK_PrincipalBase_Id));
+            var aK_PrincipalBase_IdKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            aK_PrincipalBase_Id.MappedKeys.Add(aK_PrincipalBase_IdKey);
+            RelationalModel.GetOrCreateUniqueConstraints(aK_PrincipalBase_IdKey).Add(aK_PrincipalBase_Id);
+            principalBaseTable.UniqueConstraints.Add("AK_PrincipalBase_Id", aK_PrincipalBase_Id);
+            var pK = new UniqueConstraint("PK", principalBaseTable, new[] { idColumn1, alternateIdColumn });
+            principalBaseTable.PrimaryKey = pK;
+            pK.SetRowKeyValueFactory(new CompositeRowKeyValueFactory(pK));
+            var pKKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" });
+            pK.MappedKeys.Add(pKKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pKKey).Add(pK);
+            principalBaseTable.UniqueConstraints.Add("PK", pK);
+            var iX_PrincipalBase_AlternateId_Id = new TableIndex(
+            "IX_PrincipalBase_AlternateId_Id", principalBaseTable, new[] { alternateIdColumn, idColumn1 }, false);
+            iX_PrincipalBase_AlternateId_Id.SetRowIndexValueFactory(new CompositeRowIndexValueFactory(iX_PrincipalBase_AlternateId_Id));
+            var iX_PrincipalBase_AlternateId_IdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "AlternateId", "Id" });
+            iX_PrincipalBase_AlternateId_Id.MappedIndexes.Add(iX_PrincipalBase_AlternateId_IdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBase_AlternateId_IdIx).Add(iX_PrincipalBase_AlternateId_Id);
+            principalBaseTable.Indexes.Add("IX_PrincipalBase_AlternateId_Id", iX_PrincipalBase_AlternateId_Id);
+
+            var principalBasePrincipalDerivedDependentBasebyte = FindEntityType("PrincipalBasePrincipalDerived<DependentBase<byte?>>")!;
+
+            var defaultTableMappings6 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBasePrincipalDerivedDependentBasebyte.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings6);
+            var principalBasePrincipalDerivedDependentBasebyteTableBase = new TableBase("PrincipalBasePrincipalDerived<DependentBase<byte?>>", null, relationalModel);
+            var derivedsAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("DerivedsAlternateId", "uniqueidentifier", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("DerivedsAlternateId", derivedsAlternateIdColumnBase);
+            var derivedsIdColumnBase = new ColumnBase<ColumnMappingBase>("DerivedsId", "decimal(20,0)", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("DerivedsId", derivedsIdColumnBase);
+            var principalsAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalsAlternateId", "uniqueidentifier", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("PrincipalsAlternateId", principalsAlternateIdColumnBase);
+            var principalsIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalsId", "decimal(20,0)", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("PrincipalsId", principalsIdColumnBase);
+            var rowidColumnBase = new ColumnBase<ColumnMappingBase>("rowid", "varbinary(8)", principalBasePrincipalDerivedDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("rowid", rowidColumnBase);
+            relationalModel.DefaultTables.Add("PrincipalBasePrincipalDerived<DependentBase<byte?>>", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            var principalBasePrincipalDerivedDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(principalBasePrincipalDerivedDependentBasebyte, principalBasePrincipalDerivedDependentBasebyteTableBase, null);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.AddTypeMapping(principalBasePrincipalDerivedDependentBasebyteMappingBase, false);
+            defaultTableMappings6.Add(principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)derivedsAlternateIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)derivedsIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalsAlternateIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalsIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)rowidColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("rowid")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+
+            var tableMappings6 = new List<TableMapping>();
+            principalBasePrincipalDerivedDependentBasebyte.SetRuntimeAnnotation("Relational:TableMappings", tableMappings6);
+            var principalBasePrincipalDerivedDependentBasebyteTable = new Table("PrincipalBasePrincipalDerived<DependentBase<byte?>>", null, relationalModel);
+            var derivedsIdColumn = new Column("DerivedsId", "decimal(20,0)", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("DerivedsId", derivedsIdColumn);
+            derivedsIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(derivedsIdColumn);
+            var derivedsAlternateIdColumn = new Column("DerivedsAlternateId", "uniqueidentifier", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("DerivedsAlternateId", derivedsAlternateIdColumn);
+            derivedsAlternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(derivedsAlternateIdColumn);
+            var principalsIdColumn = new Column("PrincipalsId", "decimal(20,0)", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("PrincipalsId", principalsIdColumn);
+            principalsIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(principalsIdColumn);
+            var principalsAlternateIdColumn = new Column("PrincipalsAlternateId", "uniqueidentifier", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("PrincipalsAlternateId", principalsAlternateIdColumn);
+            principalsAlternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(principalsAlternateIdColumn);
+            var rowidColumn = new Column("rowid", "varbinary(8)", principalBasePrincipalDerivedDependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("rowid", rowidColumn);
+            rowidColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(rowidColumn);
+            relationalModel.Tables.Add(("PrincipalBasePrincipalDerived<DependentBase<byte?>>", null), principalBasePrincipalDerivedDependentBasebyteTable);
+            var principalBasePrincipalDerivedDependentBasebyteTableMapping = new TableMapping(principalBasePrincipalDerivedDependentBasebyte, principalBasePrincipalDerivedDependentBasebyteTable, null);
+            principalBasePrincipalDerivedDependentBasebyteTable.AddTypeMapping(principalBasePrincipalDerivedDependentBasebyteTableMapping, false);
+            tableMappings6.Add(principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(derivedsAlternateIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(derivedsIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalsAlternateIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalsIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(rowidColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("rowid")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            var pK_PrincipalBasePrincipalDerivedDependentBasebyte = new UniqueConstraint("PK_PrincipalBasePrincipalDerived<DependentBase<byte?>>", principalBasePrincipalDerivedDependentBasebyteTable, new[] { derivedsIdColumn, derivedsAlternateIdColumn, principalsIdColumn, principalsAlternateIdColumn });
+            principalBasePrincipalDerivedDependentBasebyteTable.PrimaryKey = pK_PrincipalBasePrincipalDerivedDependentBasebyte;
+            pK_PrincipalBasePrincipalDerivedDependentBasebyte.SetRowKeyValueFactory(new CompositeRowKeyValueFactory(pK_PrincipalBasePrincipalDerivedDependentBasebyte));
+            var pK_PrincipalBasePrincipalDerivedDependentBasebyteKey = RelationalModel.GetKey(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "DerivedsId", "DerivedsAlternateId", "PrincipalsId", "PrincipalsAlternateId" });
+            pK_PrincipalBasePrincipalDerivedDependentBasebyte.MappedKeys.Add(pK_PrincipalBasePrincipalDerivedDependentBasebyteKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_PrincipalBasePrincipalDerivedDependentBasebyteKey).Add(pK_PrincipalBasePrincipalDerivedDependentBasebyte);
+            principalBasePrincipalDerivedDependentBasebyteTable.UniqueConstraints.Add("PK_PrincipalBasePrincipalDerived<DependentBase<byte?>>", pK_PrincipalBasePrincipalDerivedDependentBasebyte);
+            var iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa = new TableIndex(
+            "IX_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Principa~", principalBasePrincipalDerivedDependentBasebyteTable, new[] { principalsIdColumn, principalsAlternateIdColumn }, false);
+            iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.SetRowIndexValueFactory(new CompositeRowIndexValueFactory(iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa));
+            var iX_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaIx = RelationalModel.GetIndex(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "PrincipalsId", "PrincipalsAlternateId" });
+            iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.MappedIndexes.Add(iX_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaIx).Add(iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            principalBasePrincipalDerivedDependentBasebyteTable.Indexes.Add("IX_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Principa~", iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            var fK_DependentBasebyte_PrincipalBase_PrincipalId = new ForeignKeyConstraint(
+                "FK_DependentBase<byte?>_PrincipalBase_PrincipalId", dependentBasebyteTable, principalBaseTable,
+                new[] { principalIdColumn },
+                principalBaseTable.FindUniqueConstraint("AK_PrincipalBase_Id")!, ReferentialAction.Cascade);
+            fK_DependentBasebyte_PrincipalBase_PrincipalId.SetRowForeignKeyValueFactory(RowForeignKeyValueFactoryFactory.CreateSimpleNonNullableFactory<long, long>(fK_DependentBasebyte_PrincipalBase_PrincipalId));
+            var fK_DependentBasebyte_PrincipalBase_PrincipalIdFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            fK_DependentBasebyte_PrincipalBase_PrincipalId.MappedForeignKeys.Add(fK_DependentBasebyte_PrincipalBase_PrincipalIdFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_DependentBasebyte_PrincipalBase_PrincipalIdFk).Add(fK_DependentBasebyte_PrincipalBase_PrincipalId);
+            dependentBasebyteTable.ForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalBase_PrincipalId);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalBase_PrincipalId);
+            var fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlte = new ForeignKeyConstraint(
+                "FK_DependentBase<byte?>_PrincipalBase_PrincipalId_PrincipalAlte~", dependentBasebyteTable, principalBaseTable,
+                new[] { principalIdColumn, principalAlternateIdColumn },
+                principalBaseTable.FindUniqueConstraint("PK")!, ReferentialAction.NoAction);
+            fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlte.SetRowForeignKeyValueFactory(new CompositeRowForeignKeyValueFactory(fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlte));
+            var fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlteFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId", "PrincipalAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" });
+            fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlte.MappedForeignKeys.Add(fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlteFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlteFk).Add(fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlte);
+            dependentBasebyteTable.ForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlte);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalBase_PrincipalId_PrincipalAlte);
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa = new ForeignKeyConstraint(
+                "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Principa~", principalBasePrincipalDerivedDependentBasebyteTable, principalBaseTable,
+                new[] { derivedsIdColumn, derivedsAlternateIdColumn },
+                principalBaseTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.SetRowForeignKeyValueFactory(new CompositeRowForeignKeyValueFactory(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa));
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaFk = RelationalModel.GetForeignKey(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "DerivedsId", "DerivedsAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" });
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.MappedForeignKeys.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaFk).Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            principalBasePrincipalDerivedDependentBasebyteTable.ForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1 = new ForeignKeyConstraint(
+                "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Princip~1", principalBasePrincipalDerivedDependentBasebyteTable, principalBaseTable,
+                new[] { principalsIdColumn, principalsAlternateIdColumn },
+                principalBaseTable.FindUniqueConstraint("PK")!, ReferentialAction.NoAction);
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1.SetRowForeignKeyValueFactory(new CompositeRowForeignKeyValueFactory(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1));
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1Fk = RelationalModel.GetForeignKey(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "PrincipalsId", "PrincipalsAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" });
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1.MappedForeignKeys.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1Fk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1Fk).Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1);
+            principalBasePrincipalDerivedDependentBasebyteTable.ForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentBaseEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentBaseEntityType.cs
new file mode 100644
index 00000000..59d3750f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentBaseEntityType.cs
@@ -0,0 +1,345 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.ValueGeneration;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DependentBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                baseEntityType,
+                discriminatorProperty: "EnumDiscriminator",
+                discriminatorValue: CompiledModelTestBase.Enum1.One,
+                derivedTypesCount: 1,
+                propertyCount: 4,
+                navigationCount: 1,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var principalId = runtimeEntityType.AddProperty(
+                "PrincipalId",
+                typeof(long),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0L);
+            principalId.SetAccessors(
+                long (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<long>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<long>(0) == 0L ? entry.ReadTemporaryValue<long>(0) : entry.ReadShadowValue<long>(0))),
+                long (IInternalEntry entry) => entry.ReadShadowValue<long>(0),
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(principalId, 0),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(principalId, 0));
+            principalId.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: 0,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            principalId.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            principalId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(principalId));
+
+            var principalAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalAlternateId",
+                typeof(Guid),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            principalAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<Guid>(1) : (entry.FlaggedAsTemporary(1) && entry.ReadShadowValue<Guid>(1) == new Guid("00000000-0000-0000-0000-000000000000") ? entry.ReadTemporaryValue<Guid>(1) : entry.ReadShadowValue<Guid>(1))),
+                Guid (IInternalEntry entry) => entry.ReadShadowValue<Guid>(1),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(principalAlternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(principalAlternateId, 1));
+            principalAlternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: 1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            principalAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            principalAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(principalAlternateId));
+
+            var enumDiscriminator = runtimeEntityType.AddProperty(
+                "EnumDiscriminator",
+                typeof(CompiledModelTestBase.Enum1),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                valueGeneratorFactory: new DiscriminatorValueGeneratorFactory().Create);
+            enumDiscriminator.SetAccessors(
+                CompiledModelTestBase.Enum1 (IInternalEntry entry) => entry.ReadShadowValue<CompiledModelTestBase.Enum1>(2),
+                CompiledModelTestBase.Enum1 (IInternalEntry entry) => entry.ReadShadowValue<CompiledModelTestBase.Enum1>(2),
+                CompiledModelTestBase.Enum1 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum1>(enumDiscriminator, 2),
+                CompiledModelTestBase.Enum1 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum1>(enumDiscriminator));
+            enumDiscriminator.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: 2,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumDiscriminator.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum1>(
+                    bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum1 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum1 (CompiledModelTestBase.Enum1 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum1>(
+                    bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum1 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum1 (CompiledModelTestBase.Enum1 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum1, int>(
+                    int (CompiledModelTestBase.Enum1 value) => ((int)value),
+                    CompiledModelTestBase.Enum1 (int value) => ((CompiledModelTestBase.Enum1)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum1, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum1, int>(
+                        int (CompiledModelTestBase.Enum1 value) => ((int)value),
+                        CompiledModelTestBase.Enum1 (int value) => ((CompiledModelTestBase.Enum1)value))));
+            enumDiscriminator.SetSentinelFromProviderValue(0);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Id", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            id.SetGetter(
+                byte? (CompiledModelTestBase.DependentBase<byte?> instance) => DependentBaseUnsafeAccessors<byte?>.Id(instance),
+                bool (CompiledModelTestBase.DependentBase<byte?> instance) => !(DependentBaseUnsafeAccessors<byte?>.Id(instance).HasValue));
+            id.SetSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, byte? value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, byte? value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                byte? (IInternalEntry entry) => entry.ReadOriginalValue<byte?>(id, 3),
+                byte? (IInternalEntry entry) => entry.GetCurrentValue<byte?>(id));
+            id.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            id.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                keyComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v));
+            id.SetComparer(new NullableValueComparer<byte>(id.TypeMapping.Comparer));
+            id.SetKeyComparer(new NullableValueComparer<byte>(id.TypeMapping.KeyComparer));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalId, principalAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalId },
+                unique: true);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId"), declaringEntityType.FindProperty("PrincipalAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.ClientNoAction,
+                unique: true,
+                required: true);
+
+            var principal = declaringEntityType.AddNavigation("Principal",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Principal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Principal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            principal.SetGetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.DependentBase<byte?> instance) => DependentBaseUnsafeAccessors<byte?>.Principal(instance),
+                bool (CompiledModelTestBase.DependentBase<byte?> instance) => DependentBaseUnsafeAccessors<byte?>.Principal(instance) == null);
+            principal.SetSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Principal(instance) = value;
+                    return instance;
+                });
+            principal.SetMaterializationSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Principal(instance) = value;
+                    return instance;
+                });
+            principal.SetAccessors(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                null,
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>>(principal));
+            principal.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 2,
+                storeGenerationIndex: -1);
+            var dependent = principalEntityType.AddNavigation("Dependent",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Dependent", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Dependent>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true,
+                lazyLoadingEnabled: false);
+
+            dependent.SetGetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance),
+                bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance) == null);
+            dependent.SetSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, CompiledModelTestBase.DependentBase<byte?> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance) = value;
+                    return instance;
+                });
+            dependent.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, CompiledModelTestBase.DependentBase<byte?> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance) = value;
+                    return instance;
+                });
+            dependent.SetAccessors(
+                CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                null,
+                CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.DependentBase<byte?>>(dependent));
+            dependent.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 4,
+                storeGenerationIndex: -1);
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var principalId = runtimeEntityType.FindProperty("PrincipalId");
+            var principalAlternateId = runtimeEntityType.FindProperty("PrincipalAlternateId");
+            var enumDiscriminator = runtimeEntityType.FindProperty("EnumDiscriminator");
+            var id = runtimeEntityType.FindProperty("Id");
+            var key = runtimeEntityType.FindKey(new[] { principalId, principalAlternateId });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key));
+            var principal = runtimeEntityType.FindNavigation("Principal");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.DependentBase<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1, byte?>(((ValueComparer<long>)(((IProperty)principalId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalId)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalAlternateId)), ((ValueComparer<CompiledModelTestBase.Enum1>)(((IProperty)enumDiscriminator).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum1>(enumDiscriminator)), (source.GetCurrentValue<byte?>(id) == null ? null : ((ValueComparer<byte?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<byte?>(id))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid>(((ValueComparer<long>)(((IProperty)principalId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetValueComparer())).Snapshot(default(Guid))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid>(default(long), default(Guid)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1>((source.ContainsKey("PrincipalId") ? ((long)(source["PrincipalId"])) : 0L), (source.ContainsKey("PrincipalAlternateId") ? ((Guid)(source["PrincipalAlternateId"])) : new Guid("00000000-0000-0000-0000-000000000000")), (source.ContainsKey("EnumDiscriminator") ? ((CompiledModelTestBase.Enum1)(source["EnumDiscriminator"])) : CompiledModelTestBase.Enum1.Default)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1>(default(long), default(Guid), default(CompiledModelTestBase.Enum1)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.DependentBase<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, object>(((ValueComparer<long>)(((IProperty)principalId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalId)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalAlternateId)), source.GetCurrentValue<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>>(principal))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 4,
+                navigationCount: 1,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 4,
+                shadowCount: 3,
+                relationshipCount: 3,
+                storeGeneratedCount: 2));
+            runtimeEntityType.AddAnnotation("DiscriminatorMappingComplete", false);
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPH");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentBaseUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentBaseUnsafeAccessors.cs
new file mode 100644
index 00000000..d7a27e94
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentBaseUnsafeAccessors.cs
@@ -0,0 +1,18 @@
+// <auto-generated />
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DependentBaseUnsafeAccessors<TKey>
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref TKey Id(CompiledModelTestBase.DependentBase<TKey> @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Principal>k__BackingField")]
+        public static extern ref CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<TKey>> Principal(CompiledModelTestBase.DependentBase<TKey> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedEntityType.cs
new file mode 100644
index 00000000..720b15cb
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedEntityType.cs
@@ -0,0 +1,174 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DependentDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<byte?>",
+                typeof(CompiledModelTestBase.DependentDerived<byte?>),
+                baseEntityType,
+                discriminatorProperty: "EnumDiscriminator",
+                discriminatorValue: CompiledModelTestBase.Enum1.Two,
+                propertyCount: 2);
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.DependentDerived<byte?>).GetProperty("Data", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentDerived<byte?>).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 20,
+                unicode: false);
+            data.SetGetter(
+                string (CompiledModelTestBase.DependentDerived<byte?> instance) => DependentDerivedUnsafeAccessors<byte?>.Data(instance),
+                bool (CompiledModelTestBase.DependentDerived<byte?> instance) => DependentDerivedUnsafeAccessors<byte?>.Data(instance) == null);
+            data.SetSetter(
+                CompiledModelTestBase.DependentDerived<byte?> (CompiledModelTestBase.DependentDerived<byte?> instance, string value) =>
+                {
+                    DependentDerivedUnsafeAccessors<byte?>.Data(instance) = value;
+                    return instance;
+                });
+            data.SetMaterializationSetter(
+                CompiledModelTestBase.DependentDerived<byte?> (CompiledModelTestBase.DependentDerived<byte?> instance, string value) =>
+                {
+                    DependentDerivedUnsafeAccessors<byte?>.Data(instance) = value;
+                    return instance;
+                });
+            data.SetAccessors(
+                string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<byte?>.Data(((CompiledModelTestBase.DependentDerived<byte?>)(entry.Entity))),
+                string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<byte?>.Data(((CompiledModelTestBase.DependentDerived<byte?>)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(data, 4),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(data));
+            data.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            data.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "char(20)",
+                    size: 20,
+                    unicode: false,
+                    fixedLength: true));
+            data.AddAnnotation("Relational:IsFixedLength", true);
+
+            var money = runtimeEntityType.AddProperty(
+                "Money",
+                typeof(decimal),
+                precision: 9,
+                scale: 3,
+                sentinel: 0m);
+            money.SetAccessors(
+                decimal (IInternalEntry entry) => entry.ReadShadowValue<decimal>(3),
+                decimal (IInternalEntry entry) => entry.ReadShadowValue<decimal>(3),
+                decimal (IInternalEntry entry) => entry.ReadOriginalValue<decimal>(money, 5),
+                decimal (IInternalEntry entry) => entry.GetCurrentValue<decimal>(money));
+            money.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: 3,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            money.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(9,3)",
+                    precision: 9,
+                    scale: 3));
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var principalId = runtimeEntityType.FindProperty("PrincipalId");
+            var principalAlternateId = runtimeEntityType.FindProperty("PrincipalAlternateId");
+            var enumDiscriminator = runtimeEntityType.FindProperty("EnumDiscriminator");
+            var id = runtimeEntityType.FindProperty("Id");
+            var data = runtimeEntityType.FindProperty("Data");
+            var money = runtimeEntityType.FindProperty("Money");
+            var principal = runtimeEntityType.FindNavigation("Principal");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.DependentDerived<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1, byte?, string, decimal>(((ValueComparer<long>)(((IProperty)principalId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalId)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalAlternateId)), ((ValueComparer<CompiledModelTestBase.Enum1>)(((IProperty)enumDiscriminator).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum1>(enumDiscriminator)), (source.GetCurrentValue<byte?>(id) == null ? null : ((ValueComparer<byte?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<byte?>(id))), (source.GetCurrentValue<string>(data) == null ? null : ((ValueComparer<string>)(((IProperty)data).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(data))), ((ValueComparer<decimal>)(((IProperty)money).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal>(money)))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid>(((ValueComparer<long>)(((IProperty)principalId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetValueComparer())).Snapshot(default(Guid))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid>(default(long), default(Guid)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1, decimal>((source.ContainsKey("PrincipalId") ? ((long)(source["PrincipalId"])) : 0L), (source.ContainsKey("PrincipalAlternateId") ? ((Guid)(source["PrincipalAlternateId"])) : new Guid("00000000-0000-0000-0000-000000000000")), (source.ContainsKey("EnumDiscriminator") ? ((CompiledModelTestBase.Enum1)(source["EnumDiscriminator"])) : CompiledModelTestBase.Enum1.Default), (source.ContainsKey("Money") ? ((decimal)(source["Money"])) : 0M)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, CompiledModelTestBase.Enum1, decimal>(default(long), default(Guid), default(CompiledModelTestBase.Enum1), default(decimal)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.DependentDerived<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, object>(((ValueComparer<long>)(((IProperty)principalId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalId)), ((ValueComparer<Guid>)(((IProperty)principalAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalAlternateId)), source.GetCurrentValue<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>>(principal))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 6,
+                navigationCount: 1,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 6,
+                shadowCount: 4,
+                relationshipCount: 3,
+                storeGeneratedCount: 2));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedUnsafeAccessors.cs
new file mode 100644
index 00000000..8847446b
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedUnsafeAccessors.cs
@@ -0,0 +1,16 @@
+// <auto-generated />
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DependentDerivedUnsafeAccessors<TKey>
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Data>k__BackingField")]
+        public static extern ref string Data(CompiledModelTestBase.DependentDerived<TKey> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesEntityType.cs
new file mode 100644
index 00000000..2dfbab56
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesEntityType.cs
@@ -0,0 +1,16409 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Reflection;
+using System.Text;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class ManyTypesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes",
+                typeof(CompiledModelTestBase.ManyTypes),
+                baseEntityType,
+                propertyCount: 241,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(CompiledModelTestBase.ManyTypesId),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                valueConverter: new CompiledModelTestBase.ManyTypesIdConverter());
+            id.SetGetter(
+                CompiledModelTestBase.ManyTypesId (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Id(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Id(instance).Equals(default(CompiledModelTestBase.ManyTypesId)));
+            id.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.ManyTypesId value) =>
+                {
+                    ManyTypesUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.ManyTypesId value) =>
+                {
+                    ManyTypesUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                CompiledModelTestBase.ManyTypesId (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<CompiledModelTestBase.ManyTypesId>(0) : (entry.FlaggedAsTemporary(0) && ManyTypesUnsafeAccessors.Id(((CompiledModelTestBase.ManyTypes)(entry.Entity))).Equals(default(CompiledModelTestBase.ManyTypesId)) ? entry.ReadTemporaryValue<CompiledModelTestBase.ManyTypesId>(0) : ManyTypesUnsafeAccessors.Id(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                CompiledModelTestBase.ManyTypesId (IInternalEntry entry) => ManyTypesUnsafeAccessors.Id(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.ManyTypesId (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.ManyTypesId>(id, 0),
+                CompiledModelTestBase.ManyTypesId (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<CompiledModelTestBase.ManyTypesId>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            id.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.ManyTypesId>(
+                    bool (CompiledModelTestBase.ManyTypesId v1, CompiledModelTestBase.ManyTypesId v2) => v1.Equals(v2),
+                    int (CompiledModelTestBase.ManyTypesId v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.ManyTypesId (CompiledModelTestBase.ManyTypesId v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.ManyTypesId>(
+                    bool (CompiledModelTestBase.ManyTypesId v1, CompiledModelTestBase.ManyTypesId v2) => v1.Equals(v2),
+                    int (CompiledModelTestBase.ManyTypesId v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.ManyTypesId (CompiledModelTestBase.ManyTypesId v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.ManyTypesId, int>(
+                    int (CompiledModelTestBase.ManyTypesId v) => v.Id,
+                    CompiledModelTestBase.ManyTypesId (int v) => new CompiledModelTestBase.ManyTypesId(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.ManyTypesId, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.ManyTypesId, int>(
+                        int (CompiledModelTestBase.ManyTypesId v) => v.Id,
+                        CompiledModelTestBase.ManyTypesId (int v) => new CompiledModelTestBase.ManyTypesId(v))));
+            id.SetCurrentValueComparer(new CurrentProviderValueComparer<CompiledModelTestBase.ManyTypesId, int>(id));
+            id.SetSentinelFromProviderValue(0);
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var @bool = runtimeEntityType.AddProperty(
+                "Bool",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Bool", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Bool>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: false);
+            @bool.SetGetter(
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Bool(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Bool(instance) == false);
+            @bool.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.Bool(instance) = value;
+                    return instance;
+                });
+            @bool.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.Bool(instance) = value;
+                    return instance;
+                });
+            @bool.SetAccessors(
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.Bool(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.Bool(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => entry.ReadOriginalValue<bool>(@bool, 1),
+                bool (IInternalEntry entry) => entry.GetCurrentValue<bool>(@bool));
+            @bool.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @bool.TypeMapping = JetBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v));
+
+            var boolArray = runtimeEntityType.AddProperty(
+                "BoolArray",
+                typeof(bool[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolArray.SetGetter(
+                bool[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolArray(instance) == null);
+            boolArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolArray(instance) = value;
+                    return instance;
+                });
+            boolArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolArray(instance) = value;
+                    return instance;
+                });
+            boolArray.SetAccessors(
+                bool[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool[] (IInternalEntry entry) => entry.ReadOriginalValue<bool[]>(boolArray, 2),
+                bool[] (IInternalEntry entry) => entry.GetCurrentValue<bool[]>(boolArray));
+            boolArray.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<bool[], bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v)),
+                keyComparer: new ListOfValueTypesComparer<bool[], bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<bool>(new JsonCollectionOfStructsReaderWriter<bool[], bool>(
+                    JsonBoolReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<bool[], bool>(
+                    JsonBoolReaderWriter.Instance),
+                elementMapping: JetBoolTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    keyComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    providerValueComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v)));
+            var boolArrayElementType = boolArray.SetElementType(typeof(bool));
+            boolArrayElementType.TypeMapping = boolArray.TypeMapping.ElementTypeMapping;
+
+            var boolReadOnlyCollection = runtimeEntityType.AddProperty(
+                "BoolReadOnlyCollection",
+                typeof(IReadOnlyCollection<bool>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_boolReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<bool> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<bool>)(ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance) == null);
+            boolReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<bool> value) =>
+                {
+                    ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance) = ((List<bool>)value);
+                    return instance;
+                });
+            boolReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<bool> value) =>
+                {
+                    ManyTypesUnsafeAccessors._boolReadOnlyCollection(instance) = ((List<bool>)value);
+                    return instance;
+                });
+            boolReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<bool> (IInternalEntry entry) => ((IReadOnlyCollection<bool>)(ManyTypesUnsafeAccessors._boolReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<bool> (IInternalEntry entry) => ((IReadOnlyCollection<bool>)(ManyTypesUnsafeAccessors._boolReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<bool> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<bool>>(boolReadOnlyCollection, 3),
+                IReadOnlyCollection<bool> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<bool>>(boolReadOnlyCollection));
+            boolReadOnlyCollection.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<bool>, bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<bool>, bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<bool>(new JsonCollectionOfStructsReaderWriter<List<bool>, bool>(
+                    JsonBoolReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<bool>, bool>(
+                    JsonBoolReaderWriter.Instance),
+                elementMapping: JetBoolTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    keyComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    providerValueComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v)));
+            var boolReadOnlyCollectionElementType = boolReadOnlyCollection.SetElementType(typeof(bool));
+            boolReadOnlyCollectionElementType.TypeMapping = boolReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var boolToStringConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToStringConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolToStringConverterProperty.SetGetter(
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToStringConverterProperty(instance) == false);
+            boolToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToStringConverterProperty.SetAccessors(
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => entry.ReadOriginalValue<bool>(boolToStringConverterProperty, 4),
+                bool (IInternalEntry entry) => entry.GetCurrentValue<bool>(boolToStringConverterProperty));
+            boolToStringConverterProperty.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<bool, string>(
+                    string (bool v) => ((string)((v ? "B" : "A"))),
+                    bool (string v) => !(string.IsNullOrEmpty(v)) && ((int)(v.ToUpperInvariant()[0])) == ((int)("B".ToUpperInvariant()[0]))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<bool, string>(
+                        string (bool v) => ((string)((v ? "B" : "A"))),
+                        bool (string v) => !(string.IsNullOrEmpty(v)) && ((int)(v.ToUpperInvariant()[0])) == ((int)("B".ToUpperInvariant()[0])))));
+            boolToStringConverterProperty.SetSentinelFromProviderValue("A");
+
+            var boolToTwoValuesConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToTwoValuesConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToTwoValuesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToTwoValuesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolToTwoValuesConverterProperty.SetGetter(
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(instance) == false);
+            boolToTwoValuesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToTwoValuesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToTwoValuesConverterProperty.SetAccessors(
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToTwoValuesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => entry.ReadOriginalValue<bool>(boolToTwoValuesConverterProperty, 5),
+                bool (IInternalEntry entry) => entry.GetCurrentValue<bool>(boolToTwoValuesConverterProperty));
+            boolToTwoValuesConverterProperty.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolToTwoValuesConverterProperty.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                converter: new ValueConverter<bool, byte>(
+                    byte (bool v) => ((byte)((v ? 1 : 0))),
+                    bool (byte v) => v == 1),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<bool, byte>(
+                        byte (bool v) => ((byte)((v ? 1 : 0))),
+                        bool (byte v) => v == 1)));
+            boolToTwoValuesConverterProperty.SetSentinelFromProviderValue((byte)0);
+
+            var boolToZeroOneConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToZeroOneConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToZeroOneConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToZeroOneConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new BoolToZeroOneConverter<short>());
+            boolToZeroOneConverterProperty.SetGetter(
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(instance) == false);
+            boolToZeroOneConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToZeroOneConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool value) =>
+                {
+                    ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(instance) = value;
+                    return instance;
+                });
+            boolToZeroOneConverterProperty.SetAccessors(
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => ManyTypesUnsafeAccessors.BoolToZeroOneConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool (IInternalEntry entry) => entry.ReadOriginalValue<bool>(boolToZeroOneConverterProperty, 6),
+                bool (IInternalEntry entry) => entry.GetCurrentValue<bool>(boolToZeroOneConverterProperty));
+            boolToZeroOneConverterProperty.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            boolToZeroOneConverterProperty.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<bool, short>(
+                    short (bool v) => ((short)((v ? 1 : 0))),
+                    bool (short v) => v == 1),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<bool, short>(
+                        short (bool v) => ((short)((v ? 1 : 0))),
+                        bool (short v) => v == 1)));
+            boolToZeroOneConverterProperty.SetSentinelFromProviderValue((short)0);
+
+            var bytes = runtimeEntityType.AddProperty(
+                "Bytes",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Bytes", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Bytes>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            bytes.SetGetter(
+                byte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Bytes(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Bytes(instance) == null);
+            bytes.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Bytes(instance) = value;
+                    return instance;
+                });
+            bytes.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Bytes(instance) = value;
+                    return instance;
+                });
+            bytes.SetAccessors(
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Bytes(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Bytes(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(bytes, 7),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(bytes));
+            bytes.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            bytes.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var bytesArray = runtimeEntityType.AddProperty(
+                "BytesArray",
+                typeof(byte[][]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BytesArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BytesArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            bytesArray.SetGetter(
+                byte[][] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BytesArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BytesArray(instance) == null);
+            bytesArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[][] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BytesArray(instance) = value;
+                    return instance;
+                });
+            bytesArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[][] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BytesArray(instance) = value;
+                    return instance;
+                });
+            bytesArray.SetAccessors(
+                byte[][] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BytesArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[][] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BytesArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[][] (IInternalEntry entry) => entry.ReadOriginalValue<byte[][]>(bytesArray, 8),
+                byte[][] (IInternalEntry entry) => entry.GetCurrentValue<byte[][]>(bytesArray));
+            bytesArray.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            bytesArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<byte[][], byte[]>(new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<byte[][], byte[]>(new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte[]>(new JsonCollectionOfReferencesReaderWriter<byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance),
+                elementMapping: JetByteArrayTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => ((object)v).GetHashCode(),
+                        byte[] (byte[] v) => v),
+                    keyComparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                        byte[] (byte[] source) => source.ToArray()),
+                    providerValueComparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                        byte[] (byte[] source) => source.ToArray()),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longbinary"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            var bytesArrayElementType = bytesArray.SetElementType(typeof(byte[]));
+            bytesArrayElementType.TypeMapping = bytesArray.TypeMapping.ElementTypeMapping;
+
+            var bytesToStringConverterProperty = runtimeEntityType.AddProperty(
+                "BytesToStringConverterProperty",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BytesToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BytesToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new BytesToStringConverter(),
+                valueComparer: new ArrayStructuralComparer<byte>());
+            bytesToStringConverterProperty.SetGetter(
+                byte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BytesToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.BytesToStringConverterProperty(instance) == null);
+            bytesToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BytesToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            bytesToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.BytesToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            bytesToStringConverterProperty.SetAccessors(
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BytesToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.BytesToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(bytesToStringConverterProperty, 9),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(bytesToStringConverterProperty));
+            bytesToStringConverterProperty.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            bytesToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<byte[], string>(
+                    string (byte[] v) => Convert.ToBase64String(v),
+                    byte[] (string v) => Convert.FromBase64String(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<byte[], string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<byte[], string>(
+                        string (byte[] v) => Convert.ToBase64String(v),
+                        byte[] (string v) => Convert.FromBase64String(v))));
+
+            var castingConverterProperty = runtimeEntityType.AddProperty(
+                "CastingConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CastingConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CastingConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new CastingConverter<int, decimal>());
+            castingConverterProperty.SetGetter(
+                int (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CastingConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CastingConverterProperty(instance) == 0);
+            castingConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.CastingConverterProperty(instance) = value;
+                    return instance;
+                });
+            castingConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.CastingConverterProperty(instance) = value;
+                    return instance;
+                });
+            castingConverterProperty.SetAccessors(
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.CastingConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.CastingConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(castingConverterProperty, 10),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(castingConverterProperty));
+            castingConverterProperty.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            castingConverterProperty.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                converter: new ValueConverter<int, decimal>(
+                    decimal (int v) => ((decimal)v),
+                    int (decimal v) => ((int)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<int, decimal>(
+                        decimal (int v) => ((decimal)v),
+                        int (decimal v) => ((int)v))));
+            castingConverterProperty.SetSentinelFromProviderValue(0m);
+
+            var @char = runtimeEntityType.AddProperty(
+                "Char",
+                typeof(char),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Char", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Char>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            @char.SetGetter(
+                char (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Char(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Char(instance) == '\0');
+            @char.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char value) =>
+                {
+                    ManyTypesUnsafeAccessors.Char(instance) = value;
+                    return instance;
+                });
+            @char.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char value) =>
+                {
+                    ManyTypesUnsafeAccessors.Char(instance) = value;
+                    return instance;
+                });
+            @char.SetAccessors(
+                char (IInternalEntry entry) => ManyTypesUnsafeAccessors.Char(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char (IInternalEntry entry) => ManyTypesUnsafeAccessors.Char(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char (IInternalEntry entry) => entry.ReadOriginalValue<char>(@char, 11),
+                char (IInternalEntry entry) => entry.GetCurrentValue<char>(@char));
+            @char.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @char.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                keyComparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<char, string>(
+                    string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0]))));
+            @char.SetSentinelFromProviderValue("\0");
+
+            var charArray = runtimeEntityType.AddProperty(
+                "CharArray",
+                typeof(char[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CharArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CharArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            charArray.SetGetter(
+                char[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CharArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CharArray(instance) == null);
+            charArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.CharArray(instance) = value;
+                    return instance;
+                });
+            charArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.CharArray(instance) = value;
+                    return instance;
+                });
+            charArray.SetAccessors(
+                char[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.CharArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.CharArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char[] (IInternalEntry entry) => entry.ReadOriginalValue<char[]>(charArray, 12),
+                char[] (IInternalEntry entry) => entry.GetCurrentValue<char[]>(charArray));
+            charArray.SetPropertyIndexes(
+                index: 12,
+                originalValueIndex: 12,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            charArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<char[], char>(new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v)),
+                keyComparer: new ListOfValueTypesComparer<char[], char>(new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<char>(new JsonCollectionOfStructsReaderWriter<char[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0]))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<char[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0])))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<char>(
+                        bool (char v1, char v2) => v1 == v2,
+                        int (char v) => ((int)v),
+                        char (char v) => v),
+                    keyComparer: new ValueComparer<char>(
+                        bool (char v1, char v2) => v1 == v2,
+                        int (char v) => ((int)v),
+                        char (char v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(1)",
+                        size: 1),
+                    converter: new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0])))));
+            var charArrayElementType = charArray.SetElementType(typeof(char));
+            charArrayElementType.TypeMapping = charArray.TypeMapping.ElementTypeMapping;
+
+            var charToStringConverterProperty = runtimeEntityType.AddProperty(
+                "CharToStringConverterProperty",
+                typeof(char),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CharToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CharToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new CharToStringConverter());
+            charToStringConverterProperty.SetGetter(
+                char (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CharToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.CharToStringConverterProperty(instance) == '\0');
+            charToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char value) =>
+                {
+                    ManyTypesUnsafeAccessors.CharToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            charToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char value) =>
+                {
+                    ManyTypesUnsafeAccessors.CharToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            charToStringConverterProperty.SetAccessors(
+                char (IInternalEntry entry) => ManyTypesUnsafeAccessors.CharToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char (IInternalEntry entry) => ManyTypesUnsafeAccessors.CharToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char (IInternalEntry entry) => entry.ReadOriginalValue<char>(charToStringConverterProperty, 13),
+                char (IInternalEntry entry) => entry.GetCurrentValue<char>(charToStringConverterProperty));
+            charToStringConverterProperty.SetPropertyIndexes(
+                index: 13,
+                originalValueIndex: 13,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            charToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                keyComparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "char(1)",
+                    size: 1,
+                    fixedLength: true),
+                converter: new ValueConverter<char, string>(
+                    string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0]))));
+            charToStringConverterProperty.SetSentinelFromProviderValue("\0");
+            charToStringConverterProperty.AddAnnotation("Relational:IsFixedLength", true);
+
+            var dateOnly = runtimeEntityType.AddProperty(
+                "DateOnly",
+                typeof(DateOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateOnly(1, 1, 1));
+            dateOnly.SetGetter(
+                DateOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnly(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnly(instance) == default(DateOnly));
+            dateOnly.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnly(instance) = value;
+                    return instance;
+                });
+            dateOnly.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnly(instance) = value;
+                    return instance;
+                });
+            dateOnly.SetAccessors(
+                DateOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly>(dateOnly, 14),
+                DateOnly (IInternalEntry entry) => entry.GetCurrentValue<DateOnly>(dateOnly));
+            dateOnly.SetPropertyIndexes(
+                index: 14,
+                originalValueIndex: 14,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateOnly.TypeMapping = JetDateOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                keyComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                providerValueComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v));
+
+            var dateOnlyArray = runtimeEntityType.AddProperty(
+                "DateOnlyArray",
+                typeof(DateOnly[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            dateOnlyArray.SetGetter(
+                DateOnly[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnlyArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnlyArray(instance) == null);
+            dateOnlyArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnlyArray(instance) = value;
+                    return instance;
+                });
+            dateOnlyArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnlyArray(instance) = value;
+                    return instance;
+                });
+            dateOnlyArray.SetAccessors(
+                DateOnly[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly[] (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly[]>(dateOnlyArray, 15),
+                DateOnly[] (IInternalEntry entry) => entry.GetCurrentValue<DateOnly[]>(dateOnlyArray));
+            dateOnlyArray.SetPropertyIndexes(
+                index: 15,
+                originalValueIndex: 15,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateOnlyArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateOnly[], DateOnly>(new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateOnly[], DateOnly>(new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateOnly>(new JsonCollectionOfStructsReaderWriter<DateOnly[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateOnly[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance),
+                elementMapping: JetDateOnlyTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v),
+                    keyComparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v),
+                    providerValueComparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v)));
+            var dateOnlyArrayElementType = dateOnlyArray.SetElementType(typeof(DateOnly));
+            dateOnlyArrayElementType.TypeMapping = dateOnlyArray.TypeMapping.ElementTypeMapping;
+
+            var dateOnlyToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateOnlyToStringConverterProperty",
+                typeof(DateOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnlyToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnlyToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateOnlyToStringConverter());
+            dateOnlyToStringConverterProperty.SetGetter(
+                DateOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(instance) == default(DateOnly));
+            dateOnlyToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateOnlyToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateOnlyToStringConverterProperty.SetAccessors(
+                DateOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateOnlyToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly>(dateOnlyToStringConverterProperty, 16),
+                DateOnly (IInternalEntry entry) => entry.GetCurrentValue<DateOnly>(dateOnlyToStringConverterProperty));
+            dateOnlyToStringConverterProperty.SetPropertyIndexes(
+                index: 16,
+                originalValueIndex: 16,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateOnlyToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                keyComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(10)",
+                    size: 10),
+                converter: new ValueConverter<DateOnly, string>(
+                    string (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"),
+                    DateOnly (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateOnly, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<DateOnly, string>(
+                        string (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"),
+                        DateOnly (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None))));
+            dateOnlyToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01");
+
+            var dateTime = runtimeEntityType.AddProperty(
+                "DateTime",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+            dateTime.SetGetter(
+                DateTime (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTime(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTime(instance) == default(DateTime));
+            dateTime.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTime(instance) = value;
+                    return instance;
+                });
+            dateTime.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTime(instance) = value;
+                    return instance;
+                });
+            dateTime.SetAccessors(
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTime(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTime(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => entry.ReadOriginalValue<DateTime>(dateTime, 17),
+                DateTime (IInternalEntry entry) => entry.GetCurrentValue<DateTime>(dateTime));
+            dateTime.SetPropertyIndexes(
+                index: 17,
+                originalValueIndex: 17,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTime.TypeMapping = JetDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v));
+
+            var dateTimeArray = runtimeEntityType.AddProperty(
+                "DateTimeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            dateTimeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeArray(instance) == null);
+            dateTimeArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeArray(instance) = value;
+                    return instance;
+                });
+            dateTimeArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeArray(instance) = value;
+                    return instance;
+                });
+            dateTimeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(dateTimeArray, 18),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(dateTimeArray));
+            dateTimeArray.SetPropertyIndexes(
+                index: 18,
+                originalValueIndex: 18,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var dateTimeArrayElementType = dateTimeArray.SetElementType(typeof(DateTime));
+            dateTimeArrayElementType.TypeMapping = dateTimeArray.TypeMapping.ElementTypeMapping;
+
+            var dateTimeOffsetToBinaryConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToBinaryConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToBinaryConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToBinaryConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToBinaryConverter());
+            dateTimeOffsetToBinaryConverterProperty.SetGetter(
+                DateTimeOffset (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(instance).EqualsExact(default(DateTimeOffset)));
+            dateTimeOffsetToBinaryConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToBinaryConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToBinaryConverterProperty.SetAccessors(
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToBinaryConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => entry.ReadOriginalValue<DateTimeOffset>(dateTimeOffsetToBinaryConverterProperty, 19),
+                DateTimeOffset (IInternalEntry entry) => entry.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToBinaryConverterProperty));
+            dateTimeOffsetToBinaryConverterProperty.SetPropertyIndexes(
+                index: 19,
+                originalValueIndex: 19,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeOffsetToBinaryConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                keyComparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<DateTimeOffset, long>(
+                    long (DateTimeOffset v) => DateTimeOffsetToBinaryConverter.ToLong(v),
+                    DateTimeOffset (long v) => DateTimeOffsetToBinaryConverter.ToDateTimeOffset(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTimeOffset, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<DateTimeOffset, long>(
+                        long (DateTimeOffset v) => DateTimeOffsetToBinaryConverter.ToLong(v),
+                        DateTimeOffset (long v) => DateTimeOffsetToBinaryConverter.ToDateTimeOffset(v))));
+            dateTimeOffsetToBinaryConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var dateTimeOffsetToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToBytesConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToBytesConverter());
+            dateTimeOffsetToBytesConverterProperty.SetGetter(
+                DateTimeOffset (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(instance).EqualsExact(default(DateTimeOffset)));
+            dateTimeOffsetToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToBytesConverterProperty.SetAccessors(
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => entry.ReadOriginalValue<DateTimeOffset>(dateTimeOffsetToBytesConverterProperty, 20),
+                DateTimeOffset (IInternalEntry entry) => entry.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToBytesConverterProperty));
+            dateTimeOffsetToBytesConverterProperty.SetPropertyIndexes(
+                index: 20,
+                originalValueIndex: 20,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeOffsetToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                keyComparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(12)",
+                    size: 12),
+                converter: new ValueConverter<DateTimeOffset, byte[]>(
+                    byte[] (DateTimeOffset v) => DateTimeOffsetToBytesConverter.ToBytes(v),
+                    DateTimeOffset (byte[] v) => DateTimeOffsetToBytesConverter.FromBytes(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTimeOffset, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<DateTimeOffset, byte[]>(
+                        byte[] (DateTimeOffset v) => DateTimeOffsetToBytesConverter.ToBytes(v),
+                        DateTimeOffset (byte[] v) => DateTimeOffsetToBytesConverter.FromBytes(v))));
+            dateTimeOffsetToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var dateTimeOffsetToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToStringConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToStringConverter());
+            dateTimeOffsetToStringConverterProperty.SetGetter(
+                DateTimeOffset (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(instance).EqualsExact(default(DateTimeOffset)));
+            dateTimeOffsetToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTimeOffset value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeOffsetToStringConverterProperty.SetAccessors(
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeOffsetToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTimeOffset (IInternalEntry entry) => entry.ReadOriginalValue<DateTimeOffset>(dateTimeOffsetToStringConverterProperty, 21),
+                DateTimeOffset (IInternalEntry entry) => entry.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToStringConverterProperty));
+            dateTimeOffsetToStringConverterProperty.SetPropertyIndexes(
+                index: 21,
+                originalValueIndex: 21,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeOffsetToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                keyComparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<DateTimeOffset, string>(
+                    string (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"),
+                    DateTimeOffset (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTimeOffset, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<DateTimeOffset, string>(
+                        string (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"),
+                        DateTimeOffset (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture))));
+            dateTimeOffsetToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01 00:00:00+00:00");
+
+            var dateTimeToBinaryConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToBinaryConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToBinaryConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToBinaryConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeToBinaryConverter());
+            dateTimeToBinaryConverterProperty.SetGetter(
+                DateTime (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(instance) == default(DateTime));
+            dateTimeToBinaryConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToBinaryConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToBinaryConverterProperty.SetAccessors(
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToBinaryConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => entry.ReadOriginalValue<DateTime>(dateTimeToBinaryConverterProperty, 22),
+                DateTime (IInternalEntry entry) => entry.GetCurrentValue<DateTime>(dateTimeToBinaryConverterProperty));
+            dateTimeToBinaryConverterProperty.SetPropertyIndexes(
+                index: 22,
+                originalValueIndex: 22,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeToBinaryConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<DateTime, long>(
+                    long (DateTime v) => v.ToBinary(),
+                    DateTime (long v) => DateTime.FromBinary(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTime, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<DateTime, long>(
+                        long (DateTime v) => v.ToBinary(),
+                        DateTime (long v) => DateTime.FromBinary(v))));
+            dateTimeToBinaryConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var dateTimeToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToStringConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeToStringConverter());
+            dateTimeToStringConverterProperty.SetGetter(
+                DateTime (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(instance) == default(DateTime));
+            dateTimeToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToStringConverterProperty.SetAccessors(
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => entry.ReadOriginalValue<DateTime>(dateTimeToStringConverterProperty, 23),
+                DateTime (IInternalEntry entry) => entry.GetCurrentValue<DateTime>(dateTimeToStringConverterProperty));
+            dateTimeToStringConverterProperty.SetPropertyIndexes(
+                index: 23,
+                originalValueIndex: 23,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<DateTime, string>(
+                    string (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"),
+                    DateTime (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTime, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<DateTime, string>(
+                        string (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"),
+                        DateTime (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture))));
+            dateTimeToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01 00:00:00");
+
+            var dateTimeToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToTicksConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+            dateTimeToTicksConverterProperty.SetGetter(
+                DateTime (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(instance) == default(DateTime));
+            dateTimeToTicksConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToTicksConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime value) =>
+                {
+                    ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            dateTimeToTicksConverterProperty.SetAccessors(
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => ManyTypesUnsafeAccessors.DateTimeToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime (IInternalEntry entry) => entry.ReadOriginalValue<DateTime>(dateTimeToTicksConverterProperty, 24),
+                DateTime (IInternalEntry entry) => entry.GetCurrentValue<DateTime>(dateTimeToTicksConverterProperty));
+            dateTimeToTicksConverterProperty.SetPropertyIndexes(
+                index: 24,
+                originalValueIndex: 24,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            dateTimeToTicksConverterProperty.TypeMapping = JetDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v));
+
+            var @decimal = runtimeEntityType.AddProperty(
+                "Decimal",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Decimal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Decimal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0m);
+            @decimal.SetGetter(
+                decimal (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Decimal(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Decimal(instance) == 0M);
+            @decimal.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.Decimal(instance) = value;
+                    return instance;
+                });
+            @decimal.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.Decimal(instance) = value;
+                    return instance;
+                });
+            @decimal.SetAccessors(
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.Decimal(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.Decimal(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => entry.ReadOriginalValue<decimal>(@decimal, 25),
+                decimal (IInternalEntry entry) => entry.GetCurrentValue<decimal>(@decimal));
+            @decimal.SetPropertyIndexes(
+                index: 25,
+                originalValueIndex: 25,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @decimal.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v));
+
+            var decimalArray = runtimeEntityType.AddProperty(
+                "DecimalArray",
+                typeof(decimal[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            decimalArray.SetGetter(
+                decimal[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalArray(instance) == null);
+            decimalArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalArray(instance) = value;
+                    return instance;
+                });
+            decimalArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalArray(instance) = value;
+                    return instance;
+                });
+            decimalArray.SetAccessors(
+                decimal[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal[] (IInternalEntry entry) => entry.ReadOriginalValue<decimal[]>(decimalArray, 26),
+                decimal[] (IInternalEntry entry) => entry.GetCurrentValue<decimal[]>(decimalArray));
+            decimalArray.SetPropertyIndexes(
+                index: 26,
+                originalValueIndex: 26,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            decimalArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<decimal[], decimal>(new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v)),
+                keyComparer: new ListOfValueTypesComparer<decimal[], decimal>(new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<decimal>(new JsonCollectionOfStructsReaderWriter<decimal[], decimal>(
+                    JsonDecimalReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<decimal[], decimal>(
+                    JsonDecimalReaderWriter.Instance),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    keyComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v)));
+            var decimalArrayElementType = decimalArray.SetElementType(typeof(decimal));
+            decimalArrayElementType.TypeMapping = decimalArray.TypeMapping.ElementTypeMapping;
+
+            var decimalNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DecimalNumberToBytesConverterProperty",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<decimal>());
+            decimalNumberToBytesConverterProperty.SetGetter(
+                decimal (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(instance) == 0M);
+            decimalNumberToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            decimalNumberToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            decimalNumberToBytesConverterProperty.SetAccessors(
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => entry.ReadOriginalValue<decimal>(decimalNumberToBytesConverterProperty, 27),
+                decimal (IInternalEntry entry) => entry.GetCurrentValue<decimal>(decimalNumberToBytesConverterProperty));
+            decimalNumberToBytesConverterProperty.SetPropertyIndexes(
+                index: 27,
+                originalValueIndex: 27,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            decimalNumberToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(16)",
+                    size: 16),
+                converter: new ValueConverter<decimal, byte[]>(
+                    byte[] (decimal v) => NumberToBytesConverter<decimal>.DecimalToBytes(v),
+                    decimal (byte[] v) => (v == null ? 0M : NumberToBytesConverter<decimal>.BytesToDecimal(v))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<decimal, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<decimal, byte[]>(
+                        byte[] (decimal v) => NumberToBytesConverter<decimal>.DecimalToBytes(v),
+                        decimal (byte[] v) => (v == null ? 0M : NumberToBytesConverter<decimal>.BytesToDecimal(v)))));
+            decimalNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var decimalNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DecimalNumberToStringConverterProperty",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<decimal>());
+            decimalNumberToStringConverterProperty.SetGetter(
+                decimal (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(instance) == 0M);
+            decimalNumberToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            decimalNumberToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal value) =>
+                {
+                    ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            decimalNumberToStringConverterProperty.SetAccessors(
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => ManyTypesUnsafeAccessors.DecimalNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal (IInternalEntry entry) => entry.ReadOriginalValue<decimal>(decimalNumberToStringConverterProperty, 28),
+                decimal (IInternalEntry entry) => entry.GetCurrentValue<decimal>(decimalNumberToStringConverterProperty));
+            decimalNumberToStringConverterProperty.SetPropertyIndexes(
+                index: 28,
+                originalValueIndex: 28,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            decimalNumberToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(64)",
+                    size: 64),
+                converter: new ValueConverter<decimal, string>(
+                    string (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    decimal (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<decimal, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<decimal, string>(
+                        string (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        decimal (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
+            decimalNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+
+            var @double = runtimeEntityType.AddProperty(
+                "Double",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Double", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Double>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0.0);
+            @double.SetGetter(
+                double (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Double(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Double(instance).Equals(0D));
+            @double.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.Double(instance) = value;
+                    return instance;
+                });
+            @double.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.Double(instance) = value;
+                    return instance;
+                });
+            @double.SetAccessors(
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.Double(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.Double(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => entry.ReadOriginalValue<double>(@double, 29),
+                double (IInternalEntry entry) => entry.GetCurrentValue<double>(@double));
+            @double.SetPropertyIndexes(
+                index: 29,
+                originalValueIndex: 29,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @double.TypeMapping = JetDoubleTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                providerValueComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v));
+
+            var doubleArray = runtimeEntityType.AddProperty(
+                "DoubleArray",
+                typeof(double[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            doubleArray.SetGetter(
+                double[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleArray(instance) == null);
+            doubleArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleArray(instance) = value;
+                    return instance;
+                });
+            doubleArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleArray(instance) = value;
+                    return instance;
+                });
+            doubleArray.SetAccessors(
+                double[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double[] (IInternalEntry entry) => entry.ReadOriginalValue<double[]>(doubleArray, 30),
+                double[] (IInternalEntry entry) => entry.GetCurrentValue<double[]>(doubleArray));
+            doubleArray.SetPropertyIndexes(
+                index: 30,
+                originalValueIndex: 30,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            doubleArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<double[], double>(new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v)),
+                keyComparer: new ListOfValueTypesComparer<double[], double>(new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<double>(new JsonCollectionOfStructsReaderWriter<double[], double>(
+                    JsonDoubleReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<double[], double>(
+                    JsonDoubleReaderWriter.Instance),
+                elementMapping: JetDoubleTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v),
+                    keyComparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v),
+                    providerValueComparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v)));
+            var doubleArrayElementType = doubleArray.SetElementType(typeof(double));
+            doubleArrayElementType.TypeMapping = doubleArray.TypeMapping.ElementTypeMapping;
+
+            var doubleNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DoubleNumberToBytesConverterProperty",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<double>());
+            doubleNumberToBytesConverterProperty.SetGetter(
+                double (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(instance).Equals(0D));
+            doubleNumberToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            doubleNumberToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            doubleNumberToBytesConverterProperty.SetAccessors(
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => entry.ReadOriginalValue<double>(doubleNumberToBytesConverterProperty, 31),
+                double (IInternalEntry entry) => entry.GetCurrentValue<double>(doubleNumberToBytesConverterProperty));
+            doubleNumberToBytesConverterProperty.SetPropertyIndexes(
+                index: 31,
+                originalValueIndex: 31,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            doubleNumberToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(8)",
+                    size: 8),
+                converter: new ValueConverter<double, byte[]>(
+                    byte[] (double v) => NumberToBytesConverter<double>.ReverseLong(BitConverter.GetBytes(v)),
+                    double (byte[] v) => (v == null ? 0D : BitConverter.ToDouble(NumberToBytesConverter<double>.ReverseLong(v), 0))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<double, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<double, byte[]>(
+                        byte[] (double v) => NumberToBytesConverter<double>.ReverseLong(BitConverter.GetBytes(v)),
+                        double (byte[] v) => (v == null ? 0D : BitConverter.ToDouble(NumberToBytesConverter<double>.ReverseLong(v), 0)))));
+            doubleNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var doubleNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DoubleNumberToStringConverterProperty",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<double>());
+            doubleNumberToStringConverterProperty.SetGetter(
+                double (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(instance).Equals(0D));
+            doubleNumberToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            doubleNumberToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double value) =>
+                {
+                    ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            doubleNumberToStringConverterProperty.SetAccessors(
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => ManyTypesUnsafeAccessors.DoubleNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double (IInternalEntry entry) => entry.ReadOriginalValue<double>(doubleNumberToStringConverterProperty, 32),
+                double (IInternalEntry entry) => entry.GetCurrentValue<double>(doubleNumberToStringConverterProperty));
+            doubleNumberToStringConverterProperty.SetPropertyIndexes(
+                index: 32,
+                originalValueIndex: 32,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            doubleNumberToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(64)",
+                    size: 64),
+                converter: new ValueConverter<double, string>(
+                    string (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", ((object)v)),
+                    double (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<double, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<double, string>(
+                        string (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", ((object)v)),
+                        double (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
+            doubleNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+
+            var enum16 = runtimeEntityType.AddProperty(
+                "Enum16",
+                typeof(CompiledModelTestBase.Enum16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16.SetGetter(
+                CompiledModelTestBase.Enum16 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum16(instance))), ((object)(CompiledModelTestBase.Enum16.Default))));
+            enum16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16(instance) = value;
+                    return instance;
+                });
+            enum16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16(instance) = value;
+                    return instance;
+                });
+            enum16.SetAccessors(
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16>(enum16, 33),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16>(enum16));
+            enum16.SetPropertyIndexes(
+                index: 33,
+                originalValueIndex: 33,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                    short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                    CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))));
+            enum16.SetSentinelFromProviderValue((short)0);
+
+            var enum16Array = runtimeEntityType.AddProperty(
+                "Enum16Array",
+                typeof(CompiledModelTestBase.Enum16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16Array.SetGetter(
+                CompiledModelTestBase.Enum16[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16Array(instance) == null);
+            enum16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16Array(instance) = value;
+                    return instance;
+                });
+            enum16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16Array(instance) = value;
+                    return instance;
+                });
+            enum16Array.SetAccessors(
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16[]>(enum16Array, 34),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16Array));
+            enum16Array.SetPropertyIndexes(
+                index: 34,
+                originalValueIndex: 34,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var enum16ArrayElementType = enum16Array.SetElementType(typeof(CompiledModelTestBase.Enum16));
+            enum16ArrayElementType.TypeMapping = enum16Array.TypeMapping.ElementTypeMapping;
+
+            var enum16AsString = runtimeEntityType.AddProperty(
+                "Enum16AsString",
+                typeof(CompiledModelTestBase.Enum16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum16AsString.SetGetter(
+                CompiledModelTestBase.Enum16 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum16AsString(instance))), ((object)(CompiledModelTestBase.Enum16.Default))));
+            enum16AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsString(instance) = value;
+                    return instance;
+                });
+            enum16AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsString(instance) = value;
+                    return instance;
+                });
+            enum16AsString.SetAccessors(
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16>(enum16AsString, 35),
+                CompiledModelTestBase.Enum16 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16>(enum16AsString));
+            enum16AsString.SetPropertyIndexes(
+                index: 35,
+                originalValueIndex: 35,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                    string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                        string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v))));
+            enum16AsString.SetSentinelFromProviderValue("Default");
+
+            var enum16AsStringArray = runtimeEntityType.AddProperty(
+                "Enum16AsStringArray",
+                typeof(CompiledModelTestBase.Enum16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum16[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsStringArray(instance) == null);
+            enum16AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum16AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum16AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16[]>(enum16AsStringArray, 36),
+                CompiledModelTestBase.Enum16[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16AsStringArray));
+            enum16AsStringArray.SetPropertyIndexes(
+                index: 36,
+                originalValueIndex: 36,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                        string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))));
+            var enum16AsStringArrayElementType = enum16AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum16),
+                providerClrType: typeof(string));
+            enum16AsStringArrayElementType.TypeMapping = enum16AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enum16AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum16AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum16> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16AsStringCollection(instance) == null);
+            enum16AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum16AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum16AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum16>>(enum16AsStringCollection, 37),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16AsStringCollection));
+            enum16AsStringCollection.SetPropertyIndexes(
+                index: 37,
+                originalValueIndex: 37,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                        string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            string (CompiledModelTestBase.Enum16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum16 (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))));
+            var enum16AsStringCollectionElementType = enum16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum16),
+                providerClrType: typeof(string));
+            enum16AsStringCollectionElementType.TypeMapping = enum16AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enum16Collection = runtimeEntityType.AddProperty(
+                "Enum16Collection",
+                typeof(List<CompiledModelTestBase.Enum16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16Collection.SetGetter(
+                List<CompiledModelTestBase.Enum16> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum16Collection(instance) == null);
+            enum16Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16Collection(instance) = value;
+                    return instance;
+                });
+            enum16Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum16Collection(instance) = value;
+                    return instance;
+                });
+            enum16Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum16>>(enum16Collection, 38),
+                List<CompiledModelTestBase.Enum16> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16Collection));
+            enum16Collection.SetPropertyIndexes(
+                index: 38,
+                originalValueIndex: 38,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum16Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var enum16CollectionElementType = enum16Collection.SetElementType(typeof(CompiledModelTestBase.Enum16));
+            enum16CollectionElementType.TypeMapping = enum16Collection.TypeMapping.ElementTypeMapping;
+
+            var enum32 = runtimeEntityType.AddProperty(
+                "Enum32",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32.SetGetter(
+                CompiledModelTestBase.Enum32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum32(instance))), ((object)(CompiledModelTestBase.Enum32.Default))));
+            enum32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32(instance) = value;
+                    return instance;
+                });
+            enum32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32(instance) = value;
+                    return instance;
+                });
+            enum32.SetAccessors(
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32>(enum32, 39),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32>(enum32));
+            enum32.SetPropertyIndexes(
+                index: 39,
+                originalValueIndex: 39,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                    CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))));
+            enum32.SetSentinelFromProviderValue(0);
+
+            var enum32Array = runtimeEntityType.AddProperty(
+                "Enum32Array",
+                typeof(CompiledModelTestBase.Enum32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32Array.SetGetter(
+                CompiledModelTestBase.Enum32[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32Array(instance) == null);
+            enum32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32Array(instance) = value;
+                    return instance;
+                });
+            enum32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32Array(instance) = value;
+                    return instance;
+                });
+            enum32Array.SetAccessors(
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32[]>(enum32Array, 40),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32Array));
+            enum32Array.SetPropertyIndexes(
+                index: 40,
+                originalValueIndex: 40,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var enum32ArrayElementType = enum32Array.SetElementType(typeof(CompiledModelTestBase.Enum32));
+            enum32ArrayElementType.TypeMapping = enum32Array.TypeMapping.ElementTypeMapping;
+
+            var enum32AsString = runtimeEntityType.AddProperty(
+                "Enum32AsString",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum32AsString.SetGetter(
+                CompiledModelTestBase.Enum32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum32AsString(instance))), ((object)(CompiledModelTestBase.Enum32.Default))));
+            enum32AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsString(instance) = value;
+                    return instance;
+                });
+            enum32AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsString(instance) = value;
+                    return instance;
+                });
+            enum32AsString.SetAccessors(
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32>(enum32AsString, 41),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32>(enum32AsString));
+            enum32AsString.SetPropertyIndexes(
+                index: 41,
+                originalValueIndex: 41,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                    string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))));
+            enum32AsString.SetSentinelFromProviderValue("Default");
+
+            var enum32AsStringArray = runtimeEntityType.AddProperty(
+                "Enum32AsStringArray",
+                typeof(CompiledModelTestBase.Enum32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum32[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsStringArray(instance) == null);
+            enum32AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum32AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum32AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32[]>(enum32AsStringArray, 42),
+                CompiledModelTestBase.Enum32[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32AsStringArray));
+            enum32AsStringArray.SetPropertyIndexes(
+                index: 42,
+                originalValueIndex: 42,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))));
+            var enum32AsStringArrayElementType = enum32AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum32),
+                providerClrType: typeof(string));
+            enum32AsStringArrayElementType.TypeMapping = enum32AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enum32AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum32AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum32> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32AsStringCollection(instance) == null);
+            enum32AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum32AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum32AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum32>>(enum32AsStringCollection, 43),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32AsStringCollection));
+            enum32AsStringCollection.SetPropertyIndexes(
+                index: 43,
+                originalValueIndex: 43,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))));
+            var enum32AsStringCollectionElementType = enum32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum32),
+                providerClrType: typeof(string));
+            enum32AsStringCollectionElementType.TypeMapping = enum32AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enum32Collection = runtimeEntityType.AddProperty(
+                "Enum32Collection",
+                typeof(List<CompiledModelTestBase.Enum32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32Collection.SetGetter(
+                List<CompiledModelTestBase.Enum32> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum32Collection(instance) == null);
+            enum32Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32Collection(instance) = value;
+                    return instance;
+                });
+            enum32Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum32Collection(instance) = value;
+                    return instance;
+                });
+            enum32Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum32>>(enum32Collection, 44),
+                List<CompiledModelTestBase.Enum32> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32Collection));
+            enum32Collection.SetPropertyIndexes(
+                index: 44,
+                originalValueIndex: 44,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum32Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var enum32CollectionElementType = enum32Collection.SetElementType(typeof(CompiledModelTestBase.Enum32));
+            enum32CollectionElementType.TypeMapping = enum32Collection.TypeMapping.ElementTypeMapping;
+
+            var enum64 = runtimeEntityType.AddProperty(
+                "Enum64",
+                typeof(CompiledModelTestBase.Enum64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64.SetGetter(
+                CompiledModelTestBase.Enum64 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum64(instance))), ((object)(CompiledModelTestBase.Enum64.Default))));
+            enum64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64(instance) = value;
+                    return instance;
+                });
+            enum64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64(instance) = value;
+                    return instance;
+                });
+            enum64.SetAccessors(
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64>(enum64, 45),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64>(enum64));
+            enum64.SetPropertyIndexes(
+                index: 45,
+                originalValueIndex: 45,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                    long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                    CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))));
+            enum64.SetSentinelFromProviderValue(0L);
+
+            var enum64Array = runtimeEntityType.AddProperty(
+                "Enum64Array",
+                typeof(CompiledModelTestBase.Enum64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64Array.SetGetter(
+                CompiledModelTestBase.Enum64[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64Array(instance) == null);
+            enum64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64Array(instance) = value;
+                    return instance;
+                });
+            enum64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64Array(instance) = value;
+                    return instance;
+                });
+            enum64Array.SetAccessors(
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64[]>(enum64Array, 46),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64Array));
+            enum64Array.SetPropertyIndexes(
+                index: 46,
+                originalValueIndex: 46,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var enum64ArrayElementType = enum64Array.SetElementType(typeof(CompiledModelTestBase.Enum64));
+            enum64ArrayElementType.TypeMapping = enum64Array.TypeMapping.ElementTypeMapping;
+
+            var enum64AsString = runtimeEntityType.AddProperty(
+                "Enum64AsString",
+                typeof(CompiledModelTestBase.Enum64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum64AsString.SetGetter(
+                CompiledModelTestBase.Enum64 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum64AsString(instance))), ((object)(CompiledModelTestBase.Enum64.Default))));
+            enum64AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsString(instance) = value;
+                    return instance;
+                });
+            enum64AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsString(instance) = value;
+                    return instance;
+                });
+            enum64AsString.SetAccessors(
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64>(enum64AsString, 47),
+                CompiledModelTestBase.Enum64 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64>(enum64AsString));
+            enum64AsString.SetPropertyIndexes(
+                index: 47,
+                originalValueIndex: 47,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                    string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                        string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v))));
+            enum64AsString.SetSentinelFromProviderValue("Default");
+
+            var enum64AsStringArray = runtimeEntityType.AddProperty(
+                "Enum64AsStringArray",
+                typeof(CompiledModelTestBase.Enum64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum64[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsStringArray(instance) == null);
+            enum64AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum64AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum64AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64[]>(enum64AsStringArray, 48),
+                CompiledModelTestBase.Enum64[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64AsStringArray));
+            enum64AsStringArray.SetPropertyIndexes(
+                index: 48,
+                originalValueIndex: 48,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                        string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))));
+            var enum64AsStringArrayElementType = enum64AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum64),
+                providerClrType: typeof(string));
+            enum64AsStringArrayElementType.TypeMapping = enum64AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enum64AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum64AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum64> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64AsStringCollection(instance) == null);
+            enum64AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum64AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum64AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum64>>(enum64AsStringCollection, 49),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64AsStringCollection));
+            enum64AsStringCollection.SetPropertyIndexes(
+                index: 49,
+                originalValueIndex: 49,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                        string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            string (CompiledModelTestBase.Enum64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum64 (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))));
+            var enum64AsStringCollectionElementType = enum64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum64),
+                providerClrType: typeof(string));
+            enum64AsStringCollectionElementType.TypeMapping = enum64AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enum64Collection = runtimeEntityType.AddProperty(
+                "Enum64Collection",
+                typeof(List<CompiledModelTestBase.Enum64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64Collection.SetGetter(
+                List<CompiledModelTestBase.Enum64> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum64Collection(instance) == null);
+            enum64Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64Collection(instance) = value;
+                    return instance;
+                });
+            enum64Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum64Collection(instance) = value;
+                    return instance;
+                });
+            enum64Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum64>>(enum64Collection, 50),
+                List<CompiledModelTestBase.Enum64> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64Collection));
+            enum64Collection.SetPropertyIndexes(
+                index: 50,
+                originalValueIndex: 50,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum64Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var enum64CollectionElementType = enum64Collection.SetElementType(typeof(CompiledModelTestBase.Enum64));
+            enum64CollectionElementType.TypeMapping = enum64Collection.TypeMapping.ElementTypeMapping;
+
+            var enum8 = runtimeEntityType.AddProperty(
+                "Enum8",
+                typeof(CompiledModelTestBase.Enum8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8.SetGetter(
+                CompiledModelTestBase.Enum8 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum8(instance))), ((object)(CompiledModelTestBase.Enum8.Default))));
+            enum8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8(instance) = value;
+                    return instance;
+                });
+            enum8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8(instance) = value;
+                    return instance;
+                });
+            enum8.SetAccessors(
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8>(enum8, 51),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8>(enum8));
+            enum8.SetPropertyIndexes(
+                index: 51,
+                originalValueIndex: 51,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                    short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                    CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))));
+            enum8.SetSentinelFromProviderValue((short)0);
+
+            var enum8Array = runtimeEntityType.AddProperty(
+                "Enum8Array",
+                typeof(CompiledModelTestBase.Enum8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8Array.SetGetter(
+                CompiledModelTestBase.Enum8[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8Array(instance) == null);
+            enum8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8Array(instance) = value;
+                    return instance;
+                });
+            enum8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8Array(instance) = value;
+                    return instance;
+                });
+            enum8Array.SetAccessors(
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8[]>(enum8Array, 52),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8Array));
+            enum8Array.SetPropertyIndexes(
+                index: 52,
+                originalValueIndex: 52,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var enum8ArrayElementType = enum8Array.SetElementType(typeof(CompiledModelTestBase.Enum8));
+            enum8ArrayElementType.TypeMapping = enum8Array.TypeMapping.ElementTypeMapping;
+
+            var enum8AsString = runtimeEntityType.AddProperty(
+                "Enum8AsString",
+                typeof(CompiledModelTestBase.Enum8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum8AsString.SetGetter(
+                CompiledModelTestBase.Enum8 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.Enum8AsString(instance))), ((object)(CompiledModelTestBase.Enum8.Default))));
+            enum8AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsString(instance) = value;
+                    return instance;
+                });
+            enum8AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsString(instance) = value;
+                    return instance;
+                });
+            enum8AsString.SetAccessors(
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8>(enum8AsString, 53),
+                CompiledModelTestBase.Enum8 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8>(enum8AsString));
+            enum8AsString.SetPropertyIndexes(
+                index: 53,
+                originalValueIndex: 53,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                    string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                        string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v))));
+            enum8AsString.SetSentinelFromProviderValue("Default");
+
+            var enum8AsStringArray = runtimeEntityType.AddProperty(
+                "Enum8AsStringArray",
+                typeof(CompiledModelTestBase.Enum8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum8[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsStringArray(instance) == null);
+            enum8AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum8AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsStringArray(instance) = value;
+                    return instance;
+                });
+            enum8AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8[]>(enum8AsStringArray, 54),
+                CompiledModelTestBase.Enum8[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8AsStringArray));
+            enum8AsStringArray.SetPropertyIndexes(
+                index: 54,
+                originalValueIndex: 54,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                        string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))));
+            var enum8AsStringArrayElementType = enum8AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum8),
+                providerClrType: typeof(string));
+            enum8AsStringArrayElementType.TypeMapping = enum8AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enum8AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum8AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum8> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8AsStringCollection(instance) == null);
+            enum8AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum8AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enum8AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum8>>(enum8AsStringCollection, 55),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8AsStringCollection));
+            enum8AsStringCollection.SetPropertyIndexes(
+                index: 55,
+                originalValueIndex: 55,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                        string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            string (CompiledModelTestBase.Enum8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.Enum8 (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))));
+            var enum8AsStringCollectionElementType = enum8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum8),
+                providerClrType: typeof(string));
+            enum8AsStringCollectionElementType.TypeMapping = enum8AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enum8Collection = runtimeEntityType.AddProperty(
+                "Enum8Collection",
+                typeof(List<CompiledModelTestBase.Enum8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8Collection.SetGetter(
+                List<CompiledModelTestBase.Enum8> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Enum8Collection(instance) == null);
+            enum8Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8Collection(instance) = value;
+                    return instance;
+                });
+            enum8Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.Enum8Collection(instance) = value;
+                    return instance;
+                });
+            enum8Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.Enum8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum8>>(enum8Collection, 56),
+                List<CompiledModelTestBase.Enum8> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8Collection));
+            enum8Collection.SetPropertyIndexes(
+                index: 56,
+                originalValueIndex: 56,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum8Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var enum8CollectionElementType = enum8Collection.SetElementType(typeof(CompiledModelTestBase.Enum8));
+            enum8CollectionElementType.TypeMapping = enum8Collection.TypeMapping.ElementTypeMapping;
+
+            var enumToNumberConverterProperty = runtimeEntityType.AddProperty(
+                "EnumToNumberConverterProperty",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumToNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumToNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new EnumToNumberConverter<CompiledModelTestBase.Enum32, int>());
+            enumToNumberConverterProperty.SetGetter(
+                CompiledModelTestBase.Enum32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(instance))), ((object)(CompiledModelTestBase.Enum32.Default))));
+            enumToNumberConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            enumToNumberConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            enumToNumberConverterProperty.SetAccessors(
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumToNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32>(enumToNumberConverterProperty, 57),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32>(enumToNumberConverterProperty));
+            enumToNumberConverterProperty.SetPropertyIndexes(
+                index: 57,
+                originalValueIndex: 57,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumToNumberConverterProperty.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                    CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))));
+            enumToNumberConverterProperty.SetSentinelFromProviderValue(0);
+
+            var enumToStringConverterProperty = runtimeEntityType.AddProperty(
+                "EnumToStringConverterProperty",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new EnumToStringConverter<CompiledModelTestBase.Enum32>());
+            enumToStringConverterProperty.SetGetter(
+                CompiledModelTestBase.Enum32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumToStringConverterProperty(instance))), ((object)(CompiledModelTestBase.Enum32.Default))));
+            enumToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            enumToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            enumToStringConverterProperty.SetAccessors(
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32>(enumToStringConverterProperty, 58),
+                CompiledModelTestBase.Enum32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32>(enumToStringConverterProperty));
+            enumToStringConverterProperty.SetPropertyIndexes(
+                index: 58,
+                originalValueIndex: 58,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                    string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        string (CompiledModelTestBase.Enum32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.Enum32 (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))));
+            enumToStringConverterProperty.SetSentinelFromProviderValue("Default");
+
+            var enumU16 = runtimeEntityType.AddProperty(
+                "EnumU16",
+                typeof(CompiledModelTestBase.EnumU16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16.SetGetter(
+                CompiledModelTestBase.EnumU16 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU16(instance))), ((object)(CompiledModelTestBase.EnumU16.Min))));
+            enumU16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16(instance) = value;
+                    return instance;
+                });
+            enumU16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16(instance) = value;
+                    return instance;
+                });
+            enumU16.SetAccessors(
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16>(enumU16, 59),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16>(enumU16));
+            enumU16.SetPropertyIndexes(
+                index: 59,
+                originalValueIndex: 59,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                    int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                    CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))));
+            enumU16.SetSentinelFromProviderValue(0);
+
+            var enumU16Array = runtimeEntityType.AddProperty(
+                "EnumU16Array",
+                typeof(CompiledModelTestBase.EnumU16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16Array.SetGetter(
+                CompiledModelTestBase.EnumU16[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16Array(instance) == null);
+            enumU16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16Array(instance) = value;
+                    return instance;
+                });
+            enumU16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16Array(instance) = value;
+                    return instance;
+                });
+            enumU16Array.SetAccessors(
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16[]>(enumU16Array, 60),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16Array));
+            enumU16Array.SetPropertyIndexes(
+                index: 60,
+                originalValueIndex: 60,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var enumU16ArrayElementType = enumU16Array.SetElementType(typeof(CompiledModelTestBase.EnumU16));
+            enumU16ArrayElementType.TypeMapping = enumU16Array.TypeMapping.ElementTypeMapping;
+
+            var enumU16AsString = runtimeEntityType.AddProperty(
+                "EnumU16AsString",
+                typeof(CompiledModelTestBase.EnumU16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU16AsString.SetGetter(
+                CompiledModelTestBase.EnumU16 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU16AsString(instance))), ((object)(CompiledModelTestBase.EnumU16.Min))));
+            enumU16AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsString(instance) = value;
+                    return instance;
+                });
+            enumU16AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsString(instance) = value;
+                    return instance;
+                });
+            enumU16AsString.SetAccessors(
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16>(enumU16AsString, 61),
+                CompiledModelTestBase.EnumU16 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16>(enumU16AsString));
+            enumU16AsString.SetPropertyIndexes(
+                index: 61,
+                originalValueIndex: 61,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                    string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                        string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v))));
+            enumU16AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU16AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU16AsStringArray",
+                typeof(CompiledModelTestBase.EnumU16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU16[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsStringArray(instance) == null);
+            enumU16AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU16AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU16AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16[]>(enumU16AsStringArray, 62),
+                CompiledModelTestBase.EnumU16[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16AsStringArray));
+            enumU16AsStringArray.SetPropertyIndexes(
+                index: 62,
+                originalValueIndex: 62,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                        string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))));
+            var enumU16AsStringArrayElementType = enumU16AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU16),
+                providerClrType: typeof(string));
+            enumU16AsStringArrayElementType.TypeMapping = enumU16AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enumU16AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU16AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU16> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16AsStringCollection(instance) == null);
+            enumU16AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU16AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU16AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU16>>(enumU16AsStringCollection, 63),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16AsStringCollection));
+            enumU16AsStringCollection.SetPropertyIndexes(
+                index: 63,
+                originalValueIndex: 63,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                        string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            string (CompiledModelTestBase.EnumU16 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU16 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))));
+            var enumU16AsStringCollectionElementType = enumU16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU16),
+                providerClrType: typeof(string));
+            enumU16AsStringCollectionElementType.TypeMapping = enumU16AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enumU16Collection = runtimeEntityType.AddProperty(
+                "EnumU16Collection",
+                typeof(List<CompiledModelTestBase.EnumU16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU16> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU16Collection(instance) == null);
+            enumU16Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16Collection(instance) = value;
+                    return instance;
+                });
+            enumU16Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU16Collection(instance) = value;
+                    return instance;
+                });
+            enumU16Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU16>>(enumU16Collection, 64),
+                List<CompiledModelTestBase.EnumU16> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16Collection));
+            enumU16Collection.SetPropertyIndexes(
+                index: 64,
+                originalValueIndex: 64,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU16Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var enumU16CollectionElementType = enumU16Collection.SetElementType(typeof(CompiledModelTestBase.EnumU16));
+            enumU16CollectionElementType.TypeMapping = enumU16Collection.TypeMapping.ElementTypeMapping;
+
+            var enumU32 = runtimeEntityType.AddProperty(
+                "EnumU32",
+                typeof(CompiledModelTestBase.EnumU32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32.SetGetter(
+                CompiledModelTestBase.EnumU32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU32(instance))), ((object)(CompiledModelTestBase.EnumU32.Min))));
+            enumU32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32(instance) = value;
+                    return instance;
+                });
+            enumU32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32(instance) = value;
+                    return instance;
+                });
+            enumU32.SetAccessors(
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32>(enumU32, 65),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32>(enumU32));
+            enumU32.SetPropertyIndexes(
+                index: 65,
+                originalValueIndex: 65,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                    long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                    CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))));
+            enumU32.SetSentinelFromProviderValue(0L);
+
+            var enumU32Array = runtimeEntityType.AddProperty(
+                "EnumU32Array",
+                typeof(CompiledModelTestBase.EnumU32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32Array.SetGetter(
+                CompiledModelTestBase.EnumU32[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32Array(instance) == null);
+            enumU32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32Array(instance) = value;
+                    return instance;
+                });
+            enumU32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32Array(instance) = value;
+                    return instance;
+                });
+            enumU32Array.SetAccessors(
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32[]>(enumU32Array, 66),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32Array));
+            enumU32Array.SetPropertyIndexes(
+                index: 66,
+                originalValueIndex: 66,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var enumU32ArrayElementType = enumU32Array.SetElementType(typeof(CompiledModelTestBase.EnumU32));
+            enumU32ArrayElementType.TypeMapping = enumU32Array.TypeMapping.ElementTypeMapping;
+
+            var enumU32AsString = runtimeEntityType.AddProperty(
+                "EnumU32AsString",
+                typeof(CompiledModelTestBase.EnumU32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU32AsString.SetGetter(
+                CompiledModelTestBase.EnumU32 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU32AsString(instance))), ((object)(CompiledModelTestBase.EnumU32.Min))));
+            enumU32AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsString(instance) = value;
+                    return instance;
+                });
+            enumU32AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsString(instance) = value;
+                    return instance;
+                });
+            enumU32AsString.SetAccessors(
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32>(enumU32AsString, 67),
+                CompiledModelTestBase.EnumU32 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32>(enumU32AsString));
+            enumU32AsString.SetPropertyIndexes(
+                index: 67,
+                originalValueIndex: 67,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                    string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                        string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))));
+            enumU32AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU32AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU32AsStringArray",
+                typeof(CompiledModelTestBase.EnumU32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU32[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsStringArray(instance) == null);
+            enumU32AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU32AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU32AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32[]>(enumU32AsStringArray, 68),
+                CompiledModelTestBase.EnumU32[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32AsStringArray));
+            enumU32AsStringArray.SetPropertyIndexes(
+                index: 68,
+                originalValueIndex: 68,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                        string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))));
+            var enumU32AsStringArrayElementType = enumU32AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU32),
+                providerClrType: typeof(string));
+            enumU32AsStringArrayElementType.TypeMapping = enumU32AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enumU32AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU32AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU32> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32AsStringCollection(instance) == null);
+            enumU32AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU32AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU32AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU32>>(enumU32AsStringCollection, 69),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32AsStringCollection));
+            enumU32AsStringCollection.SetPropertyIndexes(
+                index: 69,
+                originalValueIndex: 69,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                        string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            string (CompiledModelTestBase.EnumU32 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU32 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))));
+            var enumU32AsStringCollectionElementType = enumU32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU32),
+                providerClrType: typeof(string));
+            enumU32AsStringCollectionElementType.TypeMapping = enumU32AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enumU32Collection = runtimeEntityType.AddProperty(
+                "EnumU32Collection",
+                typeof(List<CompiledModelTestBase.EnumU32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU32> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU32Collection(instance) == null);
+            enumU32Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32Collection(instance) = value;
+                    return instance;
+                });
+            enumU32Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU32Collection(instance) = value;
+                    return instance;
+                });
+            enumU32Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU32>>(enumU32Collection, 70),
+                List<CompiledModelTestBase.EnumU32> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32Collection));
+            enumU32Collection.SetPropertyIndexes(
+                index: 70,
+                originalValueIndex: 70,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU32Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var enumU32CollectionElementType = enumU32Collection.SetElementType(typeof(CompiledModelTestBase.EnumU32));
+            enumU32CollectionElementType.TypeMapping = enumU32Collection.TypeMapping.ElementTypeMapping;
+
+            var enumU64 = runtimeEntityType.AddProperty(
+                "EnumU64",
+                typeof(CompiledModelTestBase.EnumU64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64.SetGetter(
+                CompiledModelTestBase.EnumU64 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU64(instance))), ((object)(CompiledModelTestBase.EnumU64.Min))));
+            enumU64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64(instance) = value;
+                    return instance;
+                });
+            enumU64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64(instance) = value;
+                    return instance;
+                });
+            enumU64.SetAccessors(
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64>(enumU64, 71),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64>(enumU64));
+            enumU64.SetPropertyIndexes(
+                index: 71,
+                originalValueIndex: 71,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                    decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                    CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))));
+            enumU64.SetSentinelFromProviderValue(0m);
+
+            var enumU64Array = runtimeEntityType.AddProperty(
+                "EnumU64Array",
+                typeof(CompiledModelTestBase.EnumU64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64Array.SetGetter(
+                CompiledModelTestBase.EnumU64[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64Array(instance) == null);
+            enumU64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64Array(instance) = value;
+                    return instance;
+                });
+            enumU64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64Array(instance) = value;
+                    return instance;
+                });
+            enumU64Array.SetAccessors(
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64[]>(enumU64Array, 72),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64Array));
+            enumU64Array.SetPropertyIndexes(
+                index: 72,
+                originalValueIndex: 72,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var enumU64ArrayElementType = enumU64Array.SetElementType(typeof(CompiledModelTestBase.EnumU64));
+            enumU64ArrayElementType.TypeMapping = enumU64Array.TypeMapping.ElementTypeMapping;
+
+            var enumU64AsString = runtimeEntityType.AddProperty(
+                "EnumU64AsString",
+                typeof(CompiledModelTestBase.EnumU64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU64AsString.SetGetter(
+                CompiledModelTestBase.EnumU64 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU64AsString(instance))), ((object)(CompiledModelTestBase.EnumU64.Min))));
+            enumU64AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsString(instance) = value;
+                    return instance;
+                });
+            enumU64AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsString(instance) = value;
+                    return instance;
+                });
+            enumU64AsString.SetAccessors(
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64>(enumU64AsString, 73),
+                CompiledModelTestBase.EnumU64 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64>(enumU64AsString));
+            enumU64AsString.SetPropertyIndexes(
+                index: 73,
+                originalValueIndex: 73,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                    string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                        string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v))));
+            enumU64AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU64AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU64AsStringArray",
+                typeof(CompiledModelTestBase.EnumU64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU64[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsStringArray(instance) == null);
+            enumU64AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU64AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU64AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64[]>(enumU64AsStringArray, 74),
+                CompiledModelTestBase.EnumU64[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64AsStringArray));
+            enumU64AsStringArray.SetPropertyIndexes(
+                index: 74,
+                originalValueIndex: 74,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                        string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))));
+            var enumU64AsStringArrayElementType = enumU64AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU64),
+                providerClrType: typeof(string));
+            enumU64AsStringArrayElementType.TypeMapping = enumU64AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enumU64AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU64AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU64> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64AsStringCollection(instance) == null);
+            enumU64AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU64AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU64AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU64>>(enumU64AsStringCollection, 75),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64AsStringCollection));
+            enumU64AsStringCollection.SetPropertyIndexes(
+                index: 75,
+                originalValueIndex: 75,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                        string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            string (CompiledModelTestBase.EnumU64 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU64 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))));
+            var enumU64AsStringCollectionElementType = enumU64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU64),
+                providerClrType: typeof(string));
+            enumU64AsStringCollectionElementType.TypeMapping = enumU64AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enumU64Collection = runtimeEntityType.AddProperty(
+                "EnumU64Collection",
+                typeof(List<CompiledModelTestBase.EnumU64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU64> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU64Collection(instance) == null);
+            enumU64Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64Collection(instance) = value;
+                    return instance;
+                });
+            enumU64Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU64Collection(instance) = value;
+                    return instance;
+                });
+            enumU64Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU64>>(enumU64Collection, 76),
+                List<CompiledModelTestBase.EnumU64> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64Collection));
+            enumU64Collection.SetPropertyIndexes(
+                index: 76,
+                originalValueIndex: 76,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU64Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var enumU64CollectionElementType = enumU64Collection.SetElementType(typeof(CompiledModelTestBase.EnumU64));
+            enumU64CollectionElementType.TypeMapping = enumU64Collection.TypeMapping.ElementTypeMapping;
+
+            var enumU8 = runtimeEntityType.AddProperty(
+                "EnumU8",
+                typeof(CompiledModelTestBase.EnumU8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8.SetGetter(
+                CompiledModelTestBase.EnumU8 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU8(instance))), ((object)(CompiledModelTestBase.EnumU8.Min))));
+            enumU8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8(instance) = value;
+                    return instance;
+                });
+            enumU8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8(instance) = value;
+                    return instance;
+                });
+            enumU8.SetAccessors(
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8>(enumU8, 77),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8>(enumU8));
+            enumU8.SetPropertyIndexes(
+                index: 77,
+                originalValueIndex: 77,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                    byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                    CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))));
+            enumU8.SetSentinelFromProviderValue((byte)0);
+
+            var enumU8Array = runtimeEntityType.AddProperty(
+                "EnumU8Array",
+                typeof(CompiledModelTestBase.EnumU8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8Array.SetGetter(
+                CompiledModelTestBase.EnumU8[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8Array(instance) == null);
+            enumU8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8Array(instance) = value;
+                    return instance;
+                });
+            enumU8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8Array(instance) = value;
+                    return instance;
+                });
+            enumU8Array.SetAccessors(
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8[]>(enumU8Array, 78),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8Array));
+            enumU8Array.SetPropertyIndexes(
+                index: 78,
+                originalValueIndex: 78,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var enumU8ArrayElementType = enumU8Array.SetElementType(typeof(CompiledModelTestBase.EnumU8));
+            enumU8ArrayElementType.TypeMapping = enumU8Array.TypeMapping.ElementTypeMapping;
+
+            var enumU8AsString = runtimeEntityType.AddProperty(
+                "EnumU8AsString",
+                typeof(CompiledModelTestBase.EnumU8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU8AsString.SetGetter(
+                CompiledModelTestBase.EnumU8 (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => object.Equals(((object)(ManyTypesUnsafeAccessors.EnumU8AsString(instance))), ((object)(CompiledModelTestBase.EnumU8.Min))));
+            enumU8AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsString(instance) = value;
+                    return instance;
+                });
+            enumU8AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8 value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsString(instance) = value;
+                    return instance;
+                });
+            enumU8AsString.SetAccessors(
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8>(enumU8AsString, 79),
+                CompiledModelTestBase.EnumU8 (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8>(enumU8AsString));
+            enumU8AsString.SetPropertyIndexes(
+                index: 79,
+                originalValueIndex: 79,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8AsString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                    string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                    CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                        string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v))));
+            enumU8AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU8AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU8AsStringArray",
+                typeof(CompiledModelTestBase.EnumU8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU8[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsStringArray(instance) == null);
+            enumU8AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU8AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsStringArray(instance) = value;
+                    return instance;
+                });
+            enumU8AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8[]>(enumU8AsStringArray, 80),
+                CompiledModelTestBase.EnumU8[] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8AsStringArray));
+            enumU8AsStringArray.SetPropertyIndexes(
+                index: 80,
+                originalValueIndex: 80,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                        string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))));
+            var enumU8AsStringArrayElementType = enumU8AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU8),
+                providerClrType: typeof(string));
+            enumU8AsStringArrayElementType.TypeMapping = enumU8AsStringArray.TypeMapping.ElementTypeMapping;
+
+            var enumU8AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU8AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU8> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8AsStringCollection(instance) == null);
+            enumU8AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU8AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            enumU8AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU8>>(enumU8AsStringCollection, 81),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8AsStringCollection));
+            enumU8AsStringCollection.SetPropertyIndexes(
+                index: 81,
+                originalValueIndex: 81,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                        string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                        CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            string (CompiledModelTestBase.EnumU8 v) => ((object)v).ToString(),
+                            CompiledModelTestBase.EnumU8 (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))));
+            var enumU8AsStringCollectionElementType = enumU8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU8),
+                providerClrType: typeof(string));
+            enumU8AsStringCollectionElementType.TypeMapping = enumU8AsStringCollection.TypeMapping.ElementTypeMapping;
+
+            var enumU8Collection = runtimeEntityType.AddProperty(
+                "EnumU8Collection",
+                typeof(List<CompiledModelTestBase.EnumU8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU8> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.EnumU8Collection(instance) == null);
+            enumU8Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8Collection(instance) = value;
+                    return instance;
+                });
+            enumU8Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8> value) =>
+                {
+                    ManyTypesUnsafeAccessors.EnumU8Collection(instance) = value;
+                    return instance;
+                });
+            enumU8Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => ManyTypesUnsafeAccessors.EnumU8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU8>>(enumU8Collection, 82),
+                List<CompiledModelTestBase.EnumU8> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8Collection));
+            enumU8Collection.SetPropertyIndexes(
+                index: 82,
+                originalValueIndex: 82,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enumU8Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var enumU8CollectionElementType = enumU8Collection.SetElementType(typeof(CompiledModelTestBase.EnumU8));
+            enumU8CollectionElementType.TypeMapping = enumU8Collection.TypeMapping.ElementTypeMapping;
+
+            var @float = runtimeEntityType.AddProperty(
+                "Float",
+                typeof(float),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Float", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Float>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0f);
+            @float.SetGetter(
+                float (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Float(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Float(instance).Equals(0F));
+            @float.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float value) =>
+                {
+                    ManyTypesUnsafeAccessors.Float(instance) = value;
+                    return instance;
+                });
+            @float.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float value) =>
+                {
+                    ManyTypesUnsafeAccessors.Float(instance) = value;
+                    return instance;
+                });
+            @float.SetAccessors(
+                float (IInternalEntry entry) => ManyTypesUnsafeAccessors.Float(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float (IInternalEntry entry) => ManyTypesUnsafeAccessors.Float(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float (IInternalEntry entry) => entry.ReadOriginalValue<float>(@float, 83),
+                float (IInternalEntry entry) => entry.GetCurrentValue<float>(@float));
+            @float.SetPropertyIndexes(
+                index: 83,
+                originalValueIndex: 83,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @float.TypeMapping = JetFloatTypeMapping.Default.Clone(
+                comparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v),
+                keyComparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v),
+                providerValueComparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v));
+
+            var floatArray = runtimeEntityType.AddProperty(
+                "FloatArray",
+                typeof(float[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("FloatArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<FloatArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            floatArray.SetGetter(
+                float[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.FloatArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.FloatArray(instance) == null);
+            floatArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.FloatArray(instance) = value;
+                    return instance;
+                });
+            floatArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.FloatArray(instance) = value;
+                    return instance;
+                });
+            floatArray.SetAccessors(
+                float[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.FloatArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.FloatArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float[] (IInternalEntry entry) => entry.ReadOriginalValue<float[]>(floatArray, 84),
+                float[] (IInternalEntry entry) => entry.GetCurrentValue<float[]>(floatArray));
+            floatArray.SetPropertyIndexes(
+                index: 84,
+                originalValueIndex: 84,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            floatArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<float[], float>(new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v)),
+                keyComparer: new ListOfValueTypesComparer<float[], float>(new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<float>(new JsonCollectionOfStructsReaderWriter<float[], float>(
+                    JsonFloatReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<float[], float>(
+                    JsonFloatReaderWriter.Instance),
+                elementMapping: JetFloatTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v),
+                    keyComparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v),
+                    providerValueComparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v)));
+            var floatArrayElementType = floatArray.SetElementType(typeof(float));
+            floatArrayElementType.TypeMapping = floatArray.TypeMapping.ElementTypeMapping;
+
+            var guid = runtimeEntityType.AddProperty(
+                "Guid",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Guid", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Guid>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            guid.SetGetter(
+                Guid (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Guid(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Guid(instance) == new Guid("00000000-0000-0000-0000-000000000000"));
+            guid.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.Guid(instance) = value;
+                    return instance;
+                });
+            guid.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.Guid(instance) = value;
+                    return instance;
+                });
+            guid.SetAccessors(
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.Guid(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.Guid(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(guid, 85),
+                Guid (IInternalEntry entry) => entry.GetCurrentValue<Guid>(guid));
+            guid.SetPropertyIndexes(
+                index: 85,
+                originalValueIndex: 85,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            guid.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+
+            var guidArray = runtimeEntityType.AddProperty(
+                "GuidArray",
+                typeof(Guid[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            guidArray.SetGetter(
+                Guid[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidArray(instance) == null);
+            guidArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidArray(instance) = value;
+                    return instance;
+                });
+            guidArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidArray(instance) = value;
+                    return instance;
+                });
+            guidArray.SetAccessors(
+                Guid[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid[] (IInternalEntry entry) => entry.ReadOriginalValue<Guid[]>(guidArray, 86),
+                Guid[] (IInternalEntry entry) => entry.GetCurrentValue<Guid[]>(guidArray));
+            guidArray.SetPropertyIndexes(
+                index: 86,
+                originalValueIndex: 86,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            guidArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<Guid[], Guid>(new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v)),
+                keyComparer: new ListOfValueTypesComparer<Guid[], Guid>(new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<Guid>(new JsonCollectionOfStructsReaderWriter<Guid[], Guid>(
+                    JsonGuidReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<Guid[], Guid>(
+                    JsonGuidReaderWriter.Instance),
+                elementMapping: JetGuidTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v),
+                    keyComparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v),
+                    providerValueComparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v)));
+            var guidArrayElementType = guidArray.SetElementType(typeof(Guid));
+            guidArrayElementType.TypeMapping = guidArray.TypeMapping.ElementTypeMapping;
+
+            var guidToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "GuidToBytesConverterProperty",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new GuidToBytesConverter());
+            guidToBytesConverterProperty.SetGetter(
+                Guid (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(instance) == new Guid("00000000-0000-0000-0000-000000000000"));
+            guidToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            guidToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            guidToBytesConverterProperty.SetAccessors(
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(guidToBytesConverterProperty, 87),
+                Guid (IInternalEntry entry) => entry.GetCurrentValue<Guid>(guidToBytesConverterProperty));
+            guidToBytesConverterProperty.SetPropertyIndexes(
+                index: 87,
+                originalValueIndex: 87,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            guidToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(16)",
+                    size: 16),
+                converter: new ValueConverter<Guid, byte[]>(
+                    byte[] (Guid v) => v.ToByteArray(),
+                    Guid (byte[] v) => new Guid(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Guid, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<Guid, byte[]>(
+                        byte[] (Guid v) => v.ToByteArray(),
+                        Guid (byte[] v) => new Guid(v))));
+            guidToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var guidToStringConverterProperty = runtimeEntityType.AddProperty(
+                "GuidToStringConverterProperty",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new GuidToStringConverter());
+            guidToStringConverterProperty.SetGetter(
+                Guid (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.GuidToStringConverterProperty(instance) == new Guid("00000000-0000-0000-0000-000000000000"));
+            guidToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            guidToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid value) =>
+                {
+                    ManyTypesUnsafeAccessors.GuidToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            guidToStringConverterProperty.SetAccessors(
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => ManyTypesUnsafeAccessors.GuidToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(guidToStringConverterProperty, 88),
+                Guid (IInternalEntry entry) => entry.GetCurrentValue<Guid>(guidToStringConverterProperty));
+            guidToStringConverterProperty.SetPropertyIndexes(
+                index: 88,
+                originalValueIndex: 88,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            guidToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(36)",
+                    size: 36),
+                converter: new ValueConverter<Guid, string>(
+                    string (Guid v) => v.ToString("D"),
+                    Guid (string v) => new Guid(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Guid, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Guid, string>(
+                        string (Guid v) => v.ToString("D"),
+                        Guid (string v) => new Guid(v))));
+            guidToStringConverterProperty.SetSentinelFromProviderValue("00000000-0000-0000-0000-000000000000");
+
+            var iPAddress = runtimeEntityType.AddProperty(
+                "IPAddress",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            iPAddress.SetGetter(
+                IPAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddress(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddress(instance) == null);
+            iPAddress.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddress(instance) = value;
+                    return instance;
+                });
+            iPAddress.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddress(instance) = value;
+                    return instance;
+                });
+            iPAddress.SetAccessors(
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress>(iPAddress, 89),
+                IPAddress (IInternalEntry entry) => entry.GetCurrentValue<IPAddress>(iPAddress));
+            iPAddress.SetPropertyIndexes(
+                index: 89,
+                originalValueIndex: 89,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddress.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(45)",
+                    size: 45),
+                converter: new ValueConverter<IPAddress, string>(
+                    string (IPAddress v) => ((object)v).ToString(),
+                    IPAddress (string v) => IPAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v))));
+
+            var iPAddressArray = runtimeEntityType.AddProperty(
+                "IPAddressArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            iPAddressArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressArray(instance) == null);
+            iPAddressArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressArray(instance) = value;
+                    return instance;
+                });
+            iPAddressArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressArray(instance) = value;
+                    return instance;
+                });
+            iPAddressArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(iPAddressArray, 90),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(iPAddressArray));
+            iPAddressArray.SetPropertyIndexes(
+                index: 90,
+                originalValueIndex: 90,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddressArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var iPAddressArrayElementType = iPAddressArray.SetElementType(typeof(IPAddress));
+            iPAddressArrayElementType.TypeMapping = iPAddressArray.TypeMapping.ElementTypeMapping;
+
+            var iPAddressReadOnlyCollection = runtimeEntityType.AddProperty(
+                "IPAddressReadOnlyCollection",
+                typeof(IReadOnlyCollection<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_ipAddressReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            iPAddressReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<IPAddress> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<IPAddress>)(ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance) == null);
+            iPAddressReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<IPAddress> value) =>
+                {
+                    ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance) = ((List<IPAddress>)value);
+                    return instance;
+                });
+            iPAddressReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<IPAddress> value) =>
+                {
+                    ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(instance) = ((List<IPAddress>)value);
+                    return instance;
+                });
+            iPAddressReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<IPAddress> (IInternalEntry entry) => ((IReadOnlyCollection<IPAddress>)(ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<IPAddress> (IInternalEntry entry) => ((IReadOnlyCollection<IPAddress>)(ManyTypesUnsafeAccessors._ipAddressReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<IPAddress>>(iPAddressReadOnlyCollection, 91),
+                IReadOnlyCollection<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<IPAddress>>(iPAddressReadOnlyCollection));
+            iPAddressReadOnlyCollection.SetPropertyIndexes(
+                index: 91,
+                originalValueIndex: 91,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddressReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var iPAddressReadOnlyCollectionElementType = iPAddressReadOnlyCollection.SetElementType(typeof(IPAddress),
+                providerClrType: typeof(string));
+            iPAddressReadOnlyCollectionElementType.TypeMapping = iPAddressReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var iPAddressToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "IPAddressToBytesConverterProperty",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new IPAddressToBytesConverter());
+            iPAddressToBytesConverterProperty.SetGetter(
+                IPAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(instance) == null);
+            iPAddressToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            iPAddressToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            iPAddressToBytesConverterProperty.SetAccessors(
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress>(iPAddressToBytesConverterProperty, 92),
+                IPAddress (IInternalEntry entry) => entry.GetCurrentValue<IPAddress>(iPAddressToBytesConverterProperty));
+            iPAddressToBytesConverterProperty.SetPropertyIndexes(
+                index: 92,
+                originalValueIndex: 92,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddressToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(16)",
+                    size: 16),
+                converter: new ValueConverter<IPAddress, byte[]>(
+                    byte[] (IPAddress v) => v.GetAddressBytes(),
+                    IPAddress (byte[] v) => new IPAddress(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<IPAddress, byte[]>(
+                        byte[] (IPAddress v) => v.GetAddressBytes(),
+                        IPAddress (byte[] v) => new IPAddress(v))));
+
+            var iPAddressToStringConverterProperty = runtimeEntityType.AddProperty(
+                "IPAddressToStringConverterProperty",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new IPAddressToStringConverter());
+            iPAddressToStringConverterProperty.SetGetter(
+                IPAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(instance) == null);
+            iPAddressToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            iPAddressToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            iPAddressToStringConverterProperty.SetAccessors(
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.IPAddressToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress>(iPAddressToStringConverterProperty, 93),
+                IPAddress (IInternalEntry entry) => entry.GetCurrentValue<IPAddress>(iPAddressToStringConverterProperty));
+            iPAddressToStringConverterProperty.SetPropertyIndexes(
+                index: 93,
+                originalValueIndex: 93,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            iPAddressToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(45)",
+                    size: 45),
+                converter: new ValueConverter<IPAddress, string>(
+                    string (IPAddress v) => ((object)v).ToString(),
+                    IPAddress (string v) => IPAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v))));
+
+            var int16 = runtimeEntityType.AddProperty(
+                "Int16",
+                typeof(short),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (short)0);
+            int16.SetGetter(
+                short (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int16(instance) == 0);
+            int16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int16(instance) = value;
+                    return instance;
+                });
+            int16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int16(instance) = value;
+                    return instance;
+                });
+            int16.SetAccessors(
+                short (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short (IInternalEntry entry) => entry.ReadOriginalValue<short>(int16, 94),
+                short (IInternalEntry entry) => entry.GetCurrentValue<short>(int16));
+            int16.SetPropertyIndexes(
+                index: 94,
+                originalValueIndex: 94,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int16.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                keyComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v));
+
+            var int16Array = runtimeEntityType.AddProperty(
+                "Int16Array",
+                typeof(short[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int16Array.SetGetter(
+                short[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int16Array(instance) == null);
+            int16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int16Array(instance) = value;
+                    return instance;
+                });
+            int16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int16Array(instance) = value;
+                    return instance;
+                });
+            int16Array.SetAccessors(
+                short[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short[] (IInternalEntry entry) => entry.ReadOriginalValue<short[]>(int16Array, 95),
+                short[] (IInternalEntry entry) => entry.GetCurrentValue<short[]>(int16Array));
+            int16Array.SetPropertyIndexes(
+                index: 95,
+                originalValueIndex: 95,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<short[], short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<short[], short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<short[], short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<short[], short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var int16ArrayElementType = int16Array.SetElementType(typeof(short));
+            int16ArrayElementType.TypeMapping = int16Array.TypeMapping.ElementTypeMapping;
+
+            var int32 = runtimeEntityType.AddProperty(
+                "Int32",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0);
+            int32.SetGetter(
+                int (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int32(instance) == 0);
+            int32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int32(instance) = value;
+                    return instance;
+                });
+            int32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int32(instance) = value;
+                    return instance;
+                });
+            int32.SetAccessors(
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(int32, 96),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(int32));
+            int32.SetPropertyIndexes(
+                index: 96,
+                originalValueIndex: 96,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int32.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+
+            var int32Array = runtimeEntityType.AddProperty(
+                "Int32Array",
+                typeof(int[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int32Array.SetGetter(
+                int[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int32Array(instance) == null);
+            int32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int32Array(instance) = value;
+                    return instance;
+                });
+            int32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int32Array(instance) = value;
+                    return instance;
+                });
+            int32Array.SetAccessors(
+                int[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int[] (IInternalEntry entry) => entry.ReadOriginalValue<int[]>(int32Array, 97),
+                int[] (IInternalEntry entry) => entry.GetCurrentValue<int[]>(int32Array));
+            int32Array.SetPropertyIndexes(
+                index: 97,
+                originalValueIndex: 97,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<int[], int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v)),
+                keyComparer: new ListOfValueTypesComparer<int[], int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<int>(new JsonCollectionOfStructsReaderWriter<int[], int>(
+                    JsonInt32ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<int[], int>(
+                    JsonInt32ReaderWriter.Instance),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v)));
+            var int32ArrayElementType = int32Array.SetElementType(typeof(int));
+            int32ArrayElementType.TypeMapping = int32Array.TypeMapping.ElementTypeMapping;
+
+            var int32ReadOnlyCollection = runtimeEntityType.AddProperty(
+                "Int32ReadOnlyCollection",
+                typeof(IReadOnlyCollection<int>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32ReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_int32ReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int32ReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<int> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<int>)(ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance) == null);
+            int32ReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<int> value) =>
+                {
+                    ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance) = ((List<int>)value);
+                    return instance;
+                });
+            int32ReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<int> value) =>
+                {
+                    ManyTypesUnsafeAccessors._int32ReadOnlyCollection(instance) = ((List<int>)value);
+                    return instance;
+                });
+            int32ReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<int> (IInternalEntry entry) => ((IReadOnlyCollection<int>)(ManyTypesUnsafeAccessors._int32ReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<int> (IInternalEntry entry) => ((IReadOnlyCollection<int>)(ManyTypesUnsafeAccessors._int32ReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<int> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<int>>(int32ReadOnlyCollection, 98),
+                IReadOnlyCollection<int> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<int>>(int32ReadOnlyCollection));
+            int32ReadOnlyCollection.SetPropertyIndexes(
+                index: 98,
+                originalValueIndex: 98,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int32ReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<int>, int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<int>, int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<int>(new JsonCollectionOfStructsReaderWriter<List<int>, int>(
+                    JsonInt32ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<int>, int>(
+                    JsonInt32ReaderWriter.Instance),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v)));
+            var int32ReadOnlyCollectionElementType = int32ReadOnlyCollection.SetElementType(typeof(int));
+            int32ReadOnlyCollectionElementType.TypeMapping = int32ReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var int64 = runtimeEntityType.AddProperty(
+                "Int64",
+                typeof(long),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0L);
+            int64.SetGetter(
+                long (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int64(instance) == 0L);
+            int64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int64(instance) = value;
+                    return instance;
+                });
+            int64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int64(instance) = value;
+                    return instance;
+                });
+            int64.SetAccessors(
+                long (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(int64, 99),
+                long (IInternalEntry entry) => entry.GetCurrentValue<long>(int64));
+            int64.SetPropertyIndexes(
+                index: 99,
+                originalValueIndex: 99,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int64.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+
+            var int64Array = runtimeEntityType.AddProperty(
+                "Int64Array",
+                typeof(long[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int64Array.SetGetter(
+                long[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int64Array(instance) == null);
+            int64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int64Array(instance) = value;
+                    return instance;
+                });
+            int64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int64Array(instance) = value;
+                    return instance;
+                });
+            int64Array.SetAccessors(
+                long[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long[] (IInternalEntry entry) => entry.ReadOriginalValue<long[]>(int64Array, 100),
+                long[] (IInternalEntry entry) => entry.GetCurrentValue<long[]>(int64Array));
+            int64Array.SetPropertyIndexes(
+                index: 100,
+                originalValueIndex: 100,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<long[], long>(new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v)),
+                keyComparer: new ListOfValueTypesComparer<long[], long>(new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<long>(new JsonCollectionOfStructsReaderWriter<long[], long>(
+                    JsonInt64ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<long[], long>(
+                    JsonInt64ReaderWriter.Instance),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    keyComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v)));
+            var int64ArrayElementType = int64Array.SetElementType(typeof(long));
+            int64ArrayElementType.TypeMapping = int64Array.TypeMapping.ElementTypeMapping;
+
+            var int8 = runtimeEntityType.AddProperty(
+                "Int8",
+                typeof(sbyte),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int8.SetGetter(
+                sbyte (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int8(instance) == 0);
+            int8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int8(instance) = value;
+                    return instance;
+                });
+            int8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int8(instance) = value;
+                    return instance;
+                });
+            int8.SetAccessors(
+                sbyte (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte (IInternalEntry entry) => entry.ReadOriginalValue<sbyte>(int8, 101),
+                sbyte (IInternalEntry entry) => entry.GetCurrentValue<sbyte>(int8));
+            int8.SetPropertyIndexes(
+                index: 101,
+                originalValueIndex: 101,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int8.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v),
+                keyComparer: new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<sbyte, short>(
+                    short (sbyte v) => ((short)v),
+                    sbyte (short v) => ((sbyte)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<sbyte, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<sbyte, short>(
+                        short (sbyte v) => ((short)v),
+                        sbyte (short v) => ((sbyte)v))));
+            int8.SetSentinelFromProviderValue((short)0);
+
+            var int8Array = runtimeEntityType.AddProperty(
+                "Int8Array",
+                typeof(sbyte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int8Array.SetGetter(
+                sbyte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Int8Array(instance) == null);
+            int8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int8Array(instance) = value;
+                    return instance;
+                });
+            int8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.Int8Array(instance) = value;
+                    return instance;
+                });
+            int8Array.SetAccessors(
+                sbyte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.Int8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte[] (IInternalEntry entry) => entry.ReadOriginalValue<sbyte[]>(int8Array, 102),
+                sbyte[] (IInternalEntry entry) => entry.GetCurrentValue<sbyte[]>(int8Array));
+            int8Array.SetPropertyIndexes(
+                index: 102,
+                originalValueIndex: 102,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            int8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<sbyte[], sbyte>(new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<sbyte[], sbyte>(new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<sbyte>(new JsonCollectionOfStructsReaderWriter<sbyte[], sbyte>(
+                    new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<sbyte[], sbyte>(
+                    new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<sbyte>(
+                        bool (sbyte v1, sbyte v2) => v1 == v2,
+                        int (sbyte v) => ((int)v),
+                        sbyte (sbyte v) => v),
+                    keyComparer: new ValueComparer<sbyte>(
+                        bool (sbyte v1, sbyte v2) => v1 == v2,
+                        int (sbyte v) => ((int)v),
+                        sbyte (sbyte v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<sbyte, short>(
+                        short (sbyte v) => ((short)v),
+                        sbyte (short v) => ((sbyte)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v)))));
+            var int8ArrayElementType = int8Array.SetElementType(typeof(sbyte));
+            int8ArrayElementType.TypeMapping = int8Array.TypeMapping.ElementTypeMapping;
+
+            var intNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "IntNumberToBytesConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IntNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IntNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<int>());
+            intNumberToBytesConverterProperty.SetGetter(
+                int (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(instance) == 0);
+            intNumberToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            intNumberToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            intNumberToBytesConverterProperty.SetAccessors(
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.IntNumberToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(intNumberToBytesConverterProperty, 103),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(intNumberToBytesConverterProperty));
+            intNumberToBytesConverterProperty.SetPropertyIndexes(
+                index: 103,
+                originalValueIndex: 103,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            intNumberToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(4)",
+                    size: 4),
+                converter: new ValueConverter<int, byte[]>(
+                    byte[] (int v) => NumberToBytesConverter<int>.ReverseInt(BitConverter.GetBytes(v)),
+                    int (byte[] v) => (v == null ? 0 : BitConverter.ToInt32(NumberToBytesConverter<int>.ReverseInt((v.Length == 0 ? new byte[4] : v)), 0))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<int, byte[]>(
+                        byte[] (int v) => NumberToBytesConverter<int>.ReverseInt(BitConverter.GetBytes(v)),
+                        int (byte[] v) => (v == null ? 0 : BitConverter.ToInt32(NumberToBytesConverter<int>.ReverseInt((v.Length == 0 ? new byte[4] : v)), 0)))));
+            intNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0 });
+
+            var intNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "IntNumberToStringConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IntNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IntNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<int>());
+            intNumberToStringConverterProperty.SetGetter(
+                int (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(instance) == 0);
+            intNumberToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            intNumberToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int value) =>
+                {
+                    ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            intNumberToStringConverterProperty.SetAccessors(
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => ManyTypesUnsafeAccessors.IntNumberToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(intNumberToStringConverterProperty, 104),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(intNumberToStringConverterProperty));
+            intNumberToStringConverterProperty.SetPropertyIndexes(
+                index: 104,
+                originalValueIndex: 104,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            intNumberToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(64)",
+                    size: 64),
+                converter: new ValueConverter<int, string>(
+                    string (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    int (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<int, string>(
+                        string (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        int (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
+            intNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+
+            var nullIntToNullStringConverterProperty = runtimeEntityType.AddProperty(
+                "NullIntToNullStringConverterProperty",
+                typeof(int?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullIntToNullStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullIntToNullStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                valueConverter: new CompiledModelTestBase.NullIntToNullStringConverter());
+            nullIntToNullStringConverterProperty.SetGetter(
+                int? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(instance).HasValue));
+            nullIntToNullStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            nullIntToNullStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            nullIntToNullStringConverterProperty.SetAccessors(
+                int? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullIntToNullStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? (IInternalEntry entry) => entry.ReadOriginalValue<int?>(nullIntToNullStringConverterProperty, 105),
+                int? (IInternalEntry entry) => entry.GetCurrentValue<int?>(nullIntToNullStringConverterProperty));
+            nullIntToNullStringConverterProperty.SetPropertyIndexes(
+                index: 105,
+                originalValueIndex: 105,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullIntToNullStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int?>(
+                    bool (int? v1, int? v2) => v1 == v2,
+                    int (int? v) => ((int)v),
+                    int? (int? v) => v),
+                keyComparer: new ValueComparer<int?>(
+                    bool (int? v1, int? v2) => v1 == v2,
+                    int (int? v) => ((int)v),
+                    int? (int? v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<int?, string>(
+                    string (int? v) => (v == null ? null : ((object)v).ToString()),
+                    int? (string v) => (v == null || v == "<null>" ? null : ((int? )(int.Parse(v)))),
+                    convertsNulls: true),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int?, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<int?, string>(
+                        string (int? v) => (v == null ? null : ((object)v).ToString()),
+                        int? (string v) => (v == null || v == "<null>" ? null : ((int? )(int.Parse(v)))),
+                        convertsNulls: true)));
+
+            var nullableBool = runtimeEntityType.AddProperty(
+                "NullableBool",
+                typeof(bool?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBool", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBool>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableBool.SetGetter(
+                bool? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBool(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableBool(instance).HasValue));
+            nullableBool.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBool(instance) = value;
+                    return instance;
+                });
+            nullableBool.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBool(instance) = value;
+                    return instance;
+                });
+            nullableBool.SetAccessors(
+                bool? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBool(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBool(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool? (IInternalEntry entry) => entry.ReadOriginalValue<bool?>(nullableBool, 106),
+                bool? (IInternalEntry entry) => entry.GetCurrentValue<bool?>(nullableBool));
+            nullableBool.SetPropertyIndexes(
+                index: 106,
+                originalValueIndex: 106,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableBool.TypeMapping = JetBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v));
+            nullableBool.SetComparer(new NullableValueComparer<bool>(nullableBool.TypeMapping.Comparer));
+            nullableBool.SetKeyComparer(new NullableValueComparer<bool>(nullableBool.TypeMapping.KeyComparer));
+
+            var nullableBoolArray = runtimeEntityType.AddProperty(
+                "NullableBoolArray",
+                typeof(bool?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBoolArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBoolArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableBoolArray.SetGetter(
+                bool? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBoolArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBoolArray(instance) == null);
+            nullableBoolArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBoolArray(instance) = value;
+                    return instance;
+                });
+            nullableBoolArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, bool? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBoolArray(instance) = value;
+                    return instance;
+                });
+            nullableBoolArray.SetAccessors(
+                bool? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBoolArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBoolArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                bool? [] (IInternalEntry entry) => entry.ReadOriginalValue<bool? []>(nullableBoolArray, 107),
+                bool? [] (IInternalEntry entry) => entry.GetCurrentValue<bool? []>(nullableBoolArray));
+            nullableBoolArray.SetPropertyIndexes(
+                index: 107,
+                originalValueIndex: 107,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableBoolArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<bool?[], bool>(new NullableValueComparer<bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<bool?[], bool>(new NullableValueComparer<bool>(new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<bool?>(new JsonCollectionOfNullableStructsReaderWriter<bool?[], bool>(
+                    JsonBoolReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<bool?[], bool>(
+                    JsonBoolReaderWriter.Instance),
+                elementMapping: JetBoolTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    keyComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v),
+                    providerValueComparer: new ValueComparer<bool>(
+                        bool (bool v1, bool v2) => v1 == v2,
+                        int (bool v) => ((object)v).GetHashCode(),
+                        bool (bool v) => v)));
+            var nullableBoolArrayElementType = nullableBoolArray.SetElementType(typeof(bool?),
+                nullable: true);
+            nullableBoolArrayElementType.TypeMapping = nullableBoolArray.TypeMapping.ElementTypeMapping;
+            nullableBoolArrayElementType.SetComparer(new NullableValueComparer<bool>(nullableBoolArrayElementType.TypeMapping.Comparer));
+
+            var nullableBytes = runtimeEntityType.AddProperty(
+                "NullableBytes",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBytes", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBytes>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableBytes.SetGetter(
+                byte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBytes(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBytes(instance) == null);
+            nullableBytes.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBytes(instance) = value;
+                    return instance;
+                });
+            nullableBytes.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBytes(instance) = value;
+                    return instance;
+                });
+            nullableBytes.SetAccessors(
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBytes(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBytes(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(nullableBytes, 108),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(nullableBytes));
+            nullableBytes.SetPropertyIndexes(
+                index: 108,
+                originalValueIndex: 108,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableBytes.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var nullableBytesArray = runtimeEntityType.AddProperty(
+                "NullableBytesArray",
+                typeof(byte[][]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBytesArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBytesArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableBytesArray.SetGetter(
+                byte[][] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBytesArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableBytesArray(instance) == null);
+            nullableBytesArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[][] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBytesArray(instance) = value;
+                    return instance;
+                });
+            nullableBytesArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[][] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableBytesArray(instance) = value;
+                    return instance;
+                });
+            nullableBytesArray.SetAccessors(
+                byte[][] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBytesArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[][] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableBytesArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[][] (IInternalEntry entry) => entry.ReadOriginalValue<byte[][]>(nullableBytesArray, 109),
+                byte[][] (IInternalEntry entry) => entry.GetCurrentValue<byte[][]>(nullableBytesArray));
+            nullableBytesArray.SetPropertyIndexes(
+                index: 109,
+                originalValueIndex: 109,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableBytesArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<byte[][], byte[]>(new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<byte[][], byte[]>(new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte[]>(new JsonCollectionOfReferencesReaderWriter<byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance),
+                elementMapping: JetByteArrayTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => ((object)v).GetHashCode(),
+                        byte[] (byte[] v) => v),
+                    keyComparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                        byte[] (byte[] source) => source.ToArray()),
+                    providerValueComparer: new ValueComparer<byte[]>(
+                        bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                        int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                        byte[] (byte[] source) => source.ToArray()),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longbinary"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            var nullableBytesArrayElementType = nullableBytesArray.SetElementType(typeof(byte[]),
+                nullable: true);
+            nullableBytesArrayElementType.TypeMapping = nullableBytesArray.TypeMapping.ElementTypeMapping;
+
+            var nullableChar = runtimeEntityType.AddProperty(
+                "NullableChar",
+                typeof(char?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableChar", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableChar>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableChar.SetGetter(
+                char? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableChar(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableChar(instance).HasValue));
+            nullableChar.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableChar(instance) = value;
+                    return instance;
+                });
+            nullableChar.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableChar(instance) = value;
+                    return instance;
+                });
+            nullableChar.SetAccessors(
+                char? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableChar(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableChar(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char? (IInternalEntry entry) => entry.ReadOriginalValue<char?>(nullableChar, 110),
+                char? (IInternalEntry entry) => entry.GetCurrentValue<char?>(nullableChar));
+            nullableChar.SetPropertyIndexes(
+                index: 110,
+                originalValueIndex: 110,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableChar.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                keyComparer: new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<char, string>(
+                    string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                    char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0]))));
+            nullableChar.SetComparer(new NullableValueComparer<char>(nullableChar.TypeMapping.Comparer));
+            nullableChar.SetKeyComparer(new NullableValueComparer<char>(nullableChar.TypeMapping.KeyComparer));
+
+            var nullableCharArray = runtimeEntityType.AddProperty(
+                "NullableCharArray",
+                typeof(char?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableCharArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableCharArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableCharArray.SetGetter(
+                char? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableCharArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableCharArray(instance) == null);
+            nullableCharArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableCharArray(instance) = value;
+                    return instance;
+                });
+            nullableCharArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, char? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableCharArray(instance) = value;
+                    return instance;
+                });
+            nullableCharArray.SetAccessors(
+                char? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableCharArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableCharArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                char? [] (IInternalEntry entry) => entry.ReadOriginalValue<char? []>(nullableCharArray, 111),
+                char? [] (IInternalEntry entry) => entry.GetCurrentValue<char? []>(nullableCharArray));
+            nullableCharArray.SetPropertyIndexes(
+                index: 111,
+                originalValueIndex: 111,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableCharArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<char?[], char>(new NullableValueComparer<char>(new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<char?[], char>(new NullableValueComparer<char>(new ValueComparer<char>(
+                    bool (char v1, char v2) => v1 == v2,
+                    int (char v) => ((int)v),
+                    char (char v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<char?>(new JsonCollectionOfNullableStructsReaderWriter<char?[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0]))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<char?[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0])))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<char>(
+                        bool (char v1, char v2) => v1 == v2,
+                        int (char v) => ((int)v),
+                        char (char v) => v),
+                    keyComparer: new ValueComparer<char>(
+                        bool (char v1, char v2) => v1 == v2,
+                        int (char v) => ((int)v),
+                        char (char v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(1)",
+                        size: 1),
+                    converter: new ValueConverter<char, string>(
+                        string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                        char (string v) => (v.Length < 1 ? '\0' : v[0])),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            string (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
+                            char (string v) => (v.Length < 1 ? '\0' : v[0])))));
+            var nullableCharArrayElementType = nullableCharArray.SetElementType(typeof(char?),
+                nullable: true);
+            nullableCharArrayElementType.TypeMapping = nullableCharArray.TypeMapping.ElementTypeMapping;
+            nullableCharArrayElementType.SetComparer(new NullableValueComparer<char>(nullableCharArrayElementType.TypeMapping.Comparer));
+
+            var nullableDateOnly = runtimeEntityType.AddProperty(
+                "NullableDateOnly",
+                typeof(DateOnly?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDateOnly.SetGetter(
+                DateOnly? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateOnly(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableDateOnly(instance).HasValue));
+            nullableDateOnly.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateOnly(instance) = value;
+                    return instance;
+                });
+            nullableDateOnly.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateOnly(instance) = value;
+                    return instance;
+                });
+            nullableDateOnly.SetAccessors(
+                DateOnly? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly? (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly?>(nullableDateOnly, 112),
+                DateOnly? (IInternalEntry entry) => entry.GetCurrentValue<DateOnly?>(nullableDateOnly));
+            nullableDateOnly.SetPropertyIndexes(
+                index: 112,
+                originalValueIndex: 112,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDateOnly.TypeMapping = JetDateOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                keyComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                providerValueComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v));
+            nullableDateOnly.SetComparer(new NullableValueComparer<DateOnly>(nullableDateOnly.TypeMapping.Comparer));
+            nullableDateOnly.SetKeyComparer(new NullableValueComparer<DateOnly>(nullableDateOnly.TypeMapping.KeyComparer));
+
+            var nullableDateOnlyArray = runtimeEntityType.AddProperty(
+                "NullableDateOnlyArray",
+                typeof(DateOnly?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDateOnlyArray.SetGetter(
+                DateOnly? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateOnlyArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateOnlyArray(instance) == null);
+            nullableDateOnlyArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateOnlyArray(instance) = value;
+                    return instance;
+                });
+            nullableDateOnlyArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateOnly? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateOnlyArray(instance) = value;
+                    return instance;
+                });
+            nullableDateOnlyArray.SetAccessors(
+                DateOnly? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateOnly? [] (IInternalEntry entry) => entry.ReadOriginalValue<DateOnly? []>(nullableDateOnlyArray, 113),
+                DateOnly? [] (IInternalEntry entry) => entry.GetCurrentValue<DateOnly? []>(nullableDateOnlyArray));
+            nullableDateOnlyArray.SetPropertyIndexes(
+                index: 113,
+                originalValueIndex: 113,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDateOnlyArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<DateOnly?[], DateOnly>(new NullableValueComparer<DateOnly>(new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<DateOnly?[], DateOnly>(new NullableValueComparer<DateOnly>(new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateOnly?>(new JsonCollectionOfNullableStructsReaderWriter<DateOnly?[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<DateOnly?[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance),
+                elementMapping: JetDateOnlyTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v),
+                    keyComparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v),
+                    providerValueComparer: new ValueComparer<DateOnly>(
+                        bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        int (DateOnly v) => ((object)v).GetHashCode(),
+                        DateOnly (DateOnly v) => v)));
+            var nullableDateOnlyArrayElementType = nullableDateOnlyArray.SetElementType(typeof(DateOnly?),
+                nullable: true);
+            nullableDateOnlyArrayElementType.TypeMapping = nullableDateOnlyArray.TypeMapping.ElementTypeMapping;
+            nullableDateOnlyArrayElementType.SetComparer(new NullableValueComparer<DateOnly>(nullableDateOnlyArrayElementType.TypeMapping.Comparer));
+
+            var nullableDateTime = runtimeEntityType.AddProperty(
+                "NullableDateTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDateTime.SetGetter(
+                DateTime? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateTime(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableDateTime(instance).HasValue));
+            nullableDateTime.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateTime(instance) = value;
+                    return instance;
+                });
+            nullableDateTime.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateTime(instance) = value;
+                    return instance;
+                });
+            nullableDateTime.SetAccessors(
+                DateTime? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateTime(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateTime(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime? (IInternalEntry entry) => entry.ReadOriginalValue<DateTime?>(nullableDateTime, 114),
+                DateTime? (IInternalEntry entry) => entry.GetCurrentValue<DateTime?>(nullableDateTime));
+            nullableDateTime.SetPropertyIndexes(
+                index: 114,
+                originalValueIndex: 114,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDateTime.TypeMapping = JetDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v));
+            nullableDateTime.SetComparer(new NullableValueComparer<DateTime>(nullableDateTime.TypeMapping.Comparer));
+            nullableDateTime.SetKeyComparer(new NullableValueComparer<DateTime>(nullableDateTime.TypeMapping.KeyComparer));
+
+            var nullableDateTimeArray = runtimeEntityType.AddProperty(
+                "NullableDateTimeArray",
+                typeof(DateTime?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateTimeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateTimeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDateTimeArray.SetGetter(
+                DateTime? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateTimeArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDateTimeArray(instance) == null);
+            nullableDateTimeArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateTimeArray(instance) = value;
+                    return instance;
+                });
+            nullableDateTimeArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, DateTime? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDateTimeArray(instance) = value;
+                    return instance;
+                });
+            nullableDateTimeArray.SetAccessors(
+                DateTime? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateTimeArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDateTimeArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                DateTime? [] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime? []>(nullableDateTimeArray, 115),
+                DateTime? [] (IInternalEntry entry) => entry.GetCurrentValue<DateTime? []>(nullableDateTimeArray));
+            nullableDateTimeArray.SetPropertyIndexes(
+                index: 115,
+                originalValueIndex: 115,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDateTimeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<DateTime?[], DateTime>(new NullableValueComparer<DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<DateTime?[], DateTime>(new NullableValueComparer<DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime?>(new JsonCollectionOfNullableStructsReaderWriter<DateTime?[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<DateTime?[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var nullableDateTimeArrayElementType = nullableDateTimeArray.SetElementType(typeof(DateTime?),
+                nullable: true);
+            nullableDateTimeArrayElementType.TypeMapping = nullableDateTimeArray.TypeMapping.ElementTypeMapping;
+            nullableDateTimeArrayElementType.SetComparer(new NullableValueComparer<DateTime>(nullableDateTimeArrayElementType.TypeMapping.Comparer));
+
+            var nullableDecimal = runtimeEntityType.AddProperty(
+                "NullableDecimal",
+                typeof(decimal?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDecimal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDecimal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDecimal.SetGetter(
+                decimal? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDecimal(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableDecimal(instance).HasValue));
+            nullableDecimal.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDecimal(instance) = value;
+                    return instance;
+                });
+            nullableDecimal.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDecimal(instance) = value;
+                    return instance;
+                });
+            nullableDecimal.SetAccessors(
+                decimal? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDecimal(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDecimal(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal? (IInternalEntry entry) => entry.ReadOriginalValue<decimal?>(nullableDecimal, 116),
+                decimal? (IInternalEntry entry) => entry.GetCurrentValue<decimal?>(nullableDecimal));
+            nullableDecimal.SetPropertyIndexes(
+                index: 116,
+                originalValueIndex: 116,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDecimal.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v));
+            nullableDecimal.SetComparer(new NullableValueComparer<decimal>(nullableDecimal.TypeMapping.Comparer));
+            nullableDecimal.SetKeyComparer(new NullableValueComparer<decimal>(nullableDecimal.TypeMapping.KeyComparer));
+
+            var nullableDecimalArray = runtimeEntityType.AddProperty(
+                "NullableDecimalArray",
+                typeof(decimal?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDecimalArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDecimalArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDecimalArray.SetGetter(
+                decimal? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDecimalArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDecimalArray(instance) == null);
+            nullableDecimalArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDecimalArray(instance) = value;
+                    return instance;
+                });
+            nullableDecimalArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, decimal? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDecimalArray(instance) = value;
+                    return instance;
+                });
+            nullableDecimalArray.SetAccessors(
+                decimal? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDecimalArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDecimalArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                decimal? [] (IInternalEntry entry) => entry.ReadOriginalValue<decimal? []>(nullableDecimalArray, 117),
+                decimal? [] (IInternalEntry entry) => entry.GetCurrentValue<decimal? []>(nullableDecimalArray));
+            nullableDecimalArray.SetPropertyIndexes(
+                index: 117,
+                originalValueIndex: 117,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDecimalArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<decimal?[], decimal>(new NullableValueComparer<decimal>(new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<decimal?[], decimal>(new NullableValueComparer<decimal>(new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<decimal?>(new JsonCollectionOfNullableStructsReaderWriter<decimal?[], decimal>(
+                    JsonDecimalReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<decimal?[], decimal>(
+                    JsonDecimalReaderWriter.Instance),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    keyComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v)));
+            var nullableDecimalArrayElementType = nullableDecimalArray.SetElementType(typeof(decimal?),
+                nullable: true);
+            nullableDecimalArrayElementType.TypeMapping = nullableDecimalArray.TypeMapping.ElementTypeMapping;
+            nullableDecimalArrayElementType.SetComparer(new NullableValueComparer<decimal>(nullableDecimalArrayElementType.TypeMapping.Comparer));
+
+            var nullableDouble = runtimeEntityType.AddProperty(
+                "NullableDouble",
+                typeof(double?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDouble", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDouble>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDouble.SetGetter(
+                double? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDouble(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableDouble(instance).HasValue));
+            nullableDouble.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDouble(instance) = value;
+                    return instance;
+                });
+            nullableDouble.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDouble(instance) = value;
+                    return instance;
+                });
+            nullableDouble.SetAccessors(
+                double? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDouble(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDouble(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double? (IInternalEntry entry) => entry.ReadOriginalValue<double?>(nullableDouble, 118),
+                double? (IInternalEntry entry) => entry.GetCurrentValue<double?>(nullableDouble));
+            nullableDouble.SetPropertyIndexes(
+                index: 118,
+                originalValueIndex: 118,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDouble.TypeMapping = JetDoubleTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                providerValueComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v));
+            nullableDouble.SetComparer(new NullableValueComparer<double>(nullableDouble.TypeMapping.Comparer));
+            nullableDouble.SetKeyComparer(new NullableValueComparer<double>(nullableDouble.TypeMapping.KeyComparer));
+
+            var nullableDoubleArray = runtimeEntityType.AddProperty(
+                "NullableDoubleArray",
+                typeof(double?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDoubleArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDoubleArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDoubleArray.SetGetter(
+                double? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDoubleArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableDoubleArray(instance) == null);
+            nullableDoubleArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDoubleArray(instance) = value;
+                    return instance;
+                });
+            nullableDoubleArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, double? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableDoubleArray(instance) = value;
+                    return instance;
+                });
+            nullableDoubleArray.SetAccessors(
+                double? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDoubleArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableDoubleArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                double? [] (IInternalEntry entry) => entry.ReadOriginalValue<double? []>(nullableDoubleArray, 119),
+                double? [] (IInternalEntry entry) => entry.GetCurrentValue<double? []>(nullableDoubleArray));
+            nullableDoubleArray.SetPropertyIndexes(
+                index: 119,
+                originalValueIndex: 119,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableDoubleArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<double?[], double>(new NullableValueComparer<double>(new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<double?[], double>(new NullableValueComparer<double>(new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<double?>(new JsonCollectionOfNullableStructsReaderWriter<double?[], double>(
+                    JsonDoubleReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<double?[], double>(
+                    JsonDoubleReaderWriter.Instance),
+                elementMapping: JetDoubleTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v),
+                    keyComparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v),
+                    providerValueComparer: new ValueComparer<double>(
+                        bool (double v1, double v2) => v1.Equals(v2),
+                        int (double v) => ((object)v).GetHashCode(),
+                        double (double v) => v)));
+            var nullableDoubleArrayElementType = nullableDoubleArray.SetElementType(typeof(double?),
+                nullable: true);
+            nullableDoubleArrayElementType.TypeMapping = nullableDoubleArray.TypeMapping.ElementTypeMapping;
+            nullableDoubleArrayElementType.SetComparer(new NullableValueComparer<double>(nullableDoubleArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum16 = runtimeEntityType.AddProperty(
+                "NullableEnum16",
+                typeof(CompiledModelTestBase.Enum16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum16.SetGetter(
+                CompiledModelTestBase.Enum16? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum16(instance).HasValue));
+            nullableEnum16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16(instance) = (value == null ? value : ((CompiledModelTestBase.Enum16? )(((CompiledModelTestBase.Enum16)value))));
+                    return instance;
+                });
+            nullableEnum16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16(instance) = (value == null ? value : ((CompiledModelTestBase.Enum16? )(((CompiledModelTestBase.Enum16)value))));
+                    return instance;
+                });
+            nullableEnum16.SetAccessors(
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16?>(nullableEnum16, 120),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16));
+            nullableEnum16.SetPropertyIndexes(
+                index: 120,
+                originalValueIndex: 120,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                    short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                    CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))));
+            nullableEnum16.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16.TypeMapping.Comparer));
+            nullableEnum16.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16.TypeMapping.KeyComparer));
+
+            var nullableEnum16Array = runtimeEntityType.AddProperty(
+                "NullableEnum16Array",
+                typeof(CompiledModelTestBase.Enum16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16Array.SetGetter(
+                CompiledModelTestBase.Enum16? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16Array(instance) == null);
+            nullableEnum16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum16Array.SetAccessors(
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16? []>(nullableEnum16Array, 121),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16Array));
+            nullableEnum16Array.SetPropertyIndexes(
+                index: 121,
+                originalValueIndex: 121,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var nullableEnum16ArrayElementType = nullableEnum16Array.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+            nullableEnum16ArrayElementType.TypeMapping = nullableEnum16Array.TypeMapping.ElementTypeMapping;
+            nullableEnum16ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum16AsString = runtimeEntityType.AddProperty(
+                "NullableEnum16AsString",
+                typeof(CompiledModelTestBase.Enum16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum16AsString.SetGetter(
+                CompiledModelTestBase.Enum16? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum16AsString(instance).HasValue));
+            nullableEnum16AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum16? )(((CompiledModelTestBase.Enum16)value))));
+                    return instance;
+                });
+            nullableEnum16AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum16? )(((CompiledModelTestBase.Enum16)value))));
+                    return instance;
+                });
+            nullableEnum16AsString.SetAccessors(
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16?>(nullableEnum16AsString, 122),
+                CompiledModelTestBase.Enum16? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16AsString));
+            nullableEnum16AsString.SetPropertyIndexes(
+                index: 122,
+                originalValueIndex: 122,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16AsString.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                    short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                    CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))));
+            nullableEnum16AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16AsString.TypeMapping.Comparer));
+            nullableEnum16AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16AsString.TypeMapping.KeyComparer));
+
+            var nullableEnum16AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum16AsStringArray",
+                typeof(CompiledModelTestBase.Enum16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum16? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(instance) == null);
+            nullableEnum16AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum16AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum16AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum16? []>(nullableEnum16AsStringArray, 123),
+                CompiledModelTestBase.Enum16? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16AsStringArray));
+            nullableEnum16AsStringArray.SetPropertyIndexes(
+                index: 123,
+                originalValueIndex: 123,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var nullableEnum16AsStringArrayElementType = nullableEnum16AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+            nullableEnum16AsStringArrayElementType.TypeMapping = nullableEnum16AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnum16AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum16AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum16AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum16?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(instance) == null);
+            nullableEnum16AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum16AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum16AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16AsStringCollection, 124),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16AsStringCollection));
+            nullableEnum16AsStringCollection.SetPropertyIndexes(
+                index: 124,
+                originalValueIndex: 124,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var nullableEnum16AsStringCollectionElementType = nullableEnum16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+            nullableEnum16AsStringCollectionElementType.TypeMapping = nullableEnum16AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnum16AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum16Collection = runtimeEntityType.AddProperty(
+                "NullableEnum16Collection",
+                typeof(List<CompiledModelTestBase.Enum16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16Collection.SetGetter(
+                List<CompiledModelTestBase.Enum16?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum16Collection(instance) == null);
+            nullableEnum16Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum16Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum16Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum16Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16Collection, 125),
+                List<CompiledModelTestBase.Enum16?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16Collection));
+            nullableEnum16Collection.SetPropertyIndexes(
+                index: 125,
+                originalValueIndex: 125,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum16Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(new NullableValueComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        bool (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum16 (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                        CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            short (CompiledModelTestBase.Enum16 value) => ((short)value),
+                            CompiledModelTestBase.Enum16 (short value) => ((CompiledModelTestBase.Enum16)value)))));
+            var nullableEnum16CollectionElementType = nullableEnum16Collection.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+            nullableEnum16CollectionElementType.TypeMapping = nullableEnum16Collection.TypeMapping.ElementTypeMapping;
+            nullableEnum16CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum16>(nullableEnum16CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum32 = runtimeEntityType.AddProperty(
+                "NullableEnum32",
+                typeof(CompiledModelTestBase.Enum32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum32.SetGetter(
+                CompiledModelTestBase.Enum32? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum32(instance).HasValue));
+            nullableEnum32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32(instance) = (value == null ? value : ((CompiledModelTestBase.Enum32? )(((CompiledModelTestBase.Enum32)value))));
+                    return instance;
+                });
+            nullableEnum32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32(instance) = (value == null ? value : ((CompiledModelTestBase.Enum32? )(((CompiledModelTestBase.Enum32)value))));
+                    return instance;
+                });
+            nullableEnum32.SetAccessors(
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32?>(nullableEnum32, 126),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32));
+            nullableEnum32.SetPropertyIndexes(
+                index: 126,
+                originalValueIndex: 126,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                    CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))));
+            nullableEnum32.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32.TypeMapping.Comparer));
+            nullableEnum32.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32.TypeMapping.KeyComparer));
+
+            var nullableEnum32Array = runtimeEntityType.AddProperty(
+                "NullableEnum32Array",
+                typeof(CompiledModelTestBase.Enum32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32Array.SetGetter(
+                CompiledModelTestBase.Enum32? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32Array(instance) == null);
+            nullableEnum32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum32Array.SetAccessors(
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32? []>(nullableEnum32Array, 127),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32Array));
+            nullableEnum32Array.SetPropertyIndexes(
+                index: 127,
+                originalValueIndex: 127,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var nullableEnum32ArrayElementType = nullableEnum32Array.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+            nullableEnum32ArrayElementType.TypeMapping = nullableEnum32Array.TypeMapping.ElementTypeMapping;
+            nullableEnum32ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum32AsString = runtimeEntityType.AddProperty(
+                "NullableEnum32AsString",
+                typeof(CompiledModelTestBase.Enum32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum32AsString.SetGetter(
+                CompiledModelTestBase.Enum32? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum32AsString(instance).HasValue));
+            nullableEnum32AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum32? )(((CompiledModelTestBase.Enum32)value))));
+                    return instance;
+                });
+            nullableEnum32AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum32? )(((CompiledModelTestBase.Enum32)value))));
+                    return instance;
+                });
+            nullableEnum32AsString.SetAccessors(
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32?>(nullableEnum32AsString, 128),
+                CompiledModelTestBase.Enum32? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32AsString));
+            nullableEnum32AsString.SetPropertyIndexes(
+                index: 128,
+                originalValueIndex: 128,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32AsString.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                    CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))));
+            nullableEnum32AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32AsString.TypeMapping.Comparer));
+            nullableEnum32AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32AsString.TypeMapping.KeyComparer));
+
+            var nullableEnum32AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum32AsStringArray",
+                typeof(CompiledModelTestBase.Enum32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum32? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(instance) == null);
+            nullableEnum32AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum32AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum32AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum32? []>(nullableEnum32AsStringArray, 129),
+                CompiledModelTestBase.Enum32? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32AsStringArray));
+            nullableEnum32AsStringArray.SetPropertyIndexes(
+                index: 129,
+                originalValueIndex: 129,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var nullableEnum32AsStringArrayElementType = nullableEnum32AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+            nullableEnum32AsStringArrayElementType.TypeMapping = nullableEnum32AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnum32AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum32AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum32AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum32?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(instance) == null);
+            nullableEnum32AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum32AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum32AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32AsStringCollection, 130),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32AsStringCollection));
+            nullableEnum32AsStringCollection.SetPropertyIndexes(
+                index: 130,
+                originalValueIndex: 130,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var nullableEnum32AsStringCollectionElementType = nullableEnum32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+            nullableEnum32AsStringCollectionElementType.TypeMapping = nullableEnum32AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnum32AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum32Collection = runtimeEntityType.AddProperty(
+                "NullableEnum32Collection",
+                typeof(List<CompiledModelTestBase.Enum32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32Collection.SetGetter(
+                List<CompiledModelTestBase.Enum32?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum32Collection(instance) == null);
+            nullableEnum32Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum32Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum32Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum32Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32Collection, 131),
+                List<CompiledModelTestBase.Enum32?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32Collection));
+            nullableEnum32Collection.SetPropertyIndexes(
+                index: 131,
+                originalValueIndex: 131,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum32Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(new NullableValueComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        bool (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum32 (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                        CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            int (CompiledModelTestBase.Enum32 value) => ((int)value),
+                            CompiledModelTestBase.Enum32 (int value) => ((CompiledModelTestBase.Enum32)value)))));
+            var nullableEnum32CollectionElementType = nullableEnum32Collection.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+            nullableEnum32CollectionElementType.TypeMapping = nullableEnum32Collection.TypeMapping.ElementTypeMapping;
+            nullableEnum32CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum32>(nullableEnum32CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum64 = runtimeEntityType.AddProperty(
+                "NullableEnum64",
+                typeof(CompiledModelTestBase.Enum64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum64.SetGetter(
+                CompiledModelTestBase.Enum64? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum64(instance).HasValue));
+            nullableEnum64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64(instance) = (value == null ? value : ((CompiledModelTestBase.Enum64? )(((CompiledModelTestBase.Enum64)value))));
+                    return instance;
+                });
+            nullableEnum64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64(instance) = (value == null ? value : ((CompiledModelTestBase.Enum64? )(((CompiledModelTestBase.Enum64)value))));
+                    return instance;
+                });
+            nullableEnum64.SetAccessors(
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64?>(nullableEnum64, 132),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64));
+            nullableEnum64.SetPropertyIndexes(
+                index: 132,
+                originalValueIndex: 132,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                    long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                    CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))));
+            nullableEnum64.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64.TypeMapping.Comparer));
+            nullableEnum64.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64.TypeMapping.KeyComparer));
+
+            var nullableEnum64Array = runtimeEntityType.AddProperty(
+                "NullableEnum64Array",
+                typeof(CompiledModelTestBase.Enum64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64Array.SetGetter(
+                CompiledModelTestBase.Enum64? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64Array(instance) == null);
+            nullableEnum64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum64Array.SetAccessors(
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64? []>(nullableEnum64Array, 133),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64Array));
+            nullableEnum64Array.SetPropertyIndexes(
+                index: 133,
+                originalValueIndex: 133,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var nullableEnum64ArrayElementType = nullableEnum64Array.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+            nullableEnum64ArrayElementType.TypeMapping = nullableEnum64Array.TypeMapping.ElementTypeMapping;
+            nullableEnum64ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum64AsString = runtimeEntityType.AddProperty(
+                "NullableEnum64AsString",
+                typeof(CompiledModelTestBase.Enum64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum64AsString.SetGetter(
+                CompiledModelTestBase.Enum64? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum64AsString(instance).HasValue));
+            nullableEnum64AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum64? )(((CompiledModelTestBase.Enum64)value))));
+                    return instance;
+                });
+            nullableEnum64AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum64? )(((CompiledModelTestBase.Enum64)value))));
+                    return instance;
+                });
+            nullableEnum64AsString.SetAccessors(
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64?>(nullableEnum64AsString, 134),
+                CompiledModelTestBase.Enum64? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64AsString));
+            nullableEnum64AsString.SetPropertyIndexes(
+                index: 134,
+                originalValueIndex: 134,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64AsString.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                    long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                    CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))));
+            nullableEnum64AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64AsString.TypeMapping.Comparer));
+            nullableEnum64AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64AsString.TypeMapping.KeyComparer));
+
+            var nullableEnum64AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum64AsStringArray",
+                typeof(CompiledModelTestBase.Enum64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum64? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(instance) == null);
+            nullableEnum64AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum64AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum64AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum64? []>(nullableEnum64AsStringArray, 135),
+                CompiledModelTestBase.Enum64? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64AsStringArray));
+            nullableEnum64AsStringArray.SetPropertyIndexes(
+                index: 135,
+                originalValueIndex: 135,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var nullableEnum64AsStringArrayElementType = nullableEnum64AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+            nullableEnum64AsStringArrayElementType.TypeMapping = nullableEnum64AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnum64AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum64AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum64AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum64?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(instance) == null);
+            nullableEnum64AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum64AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum64AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64AsStringCollection, 136),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64AsStringCollection));
+            nullableEnum64AsStringCollection.SetPropertyIndexes(
+                index: 136,
+                originalValueIndex: 136,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var nullableEnum64AsStringCollectionElementType = nullableEnum64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+            nullableEnum64AsStringCollectionElementType.TypeMapping = nullableEnum64AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnum64AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum64Collection = runtimeEntityType.AddProperty(
+                "NullableEnum64Collection",
+                typeof(List<CompiledModelTestBase.Enum64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64Collection.SetGetter(
+                List<CompiledModelTestBase.Enum64?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum64Collection(instance) == null);
+            nullableEnum64Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum64Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum64Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum64Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64Collection, 137),
+                List<CompiledModelTestBase.Enum64?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64Collection));
+            nullableEnum64Collection.SetPropertyIndexes(
+                index: 137,
+                originalValueIndex: 137,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum64Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(new NullableValueComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        bool (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum64 (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                        CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            long (CompiledModelTestBase.Enum64 value) => ((long)value),
+                            CompiledModelTestBase.Enum64 (long value) => ((CompiledModelTestBase.Enum64)value)))));
+            var nullableEnum64CollectionElementType = nullableEnum64Collection.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+            nullableEnum64CollectionElementType.TypeMapping = nullableEnum64Collection.TypeMapping.ElementTypeMapping;
+            nullableEnum64CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum64>(nullableEnum64CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum8 = runtimeEntityType.AddProperty(
+                "NullableEnum8",
+                typeof(CompiledModelTestBase.Enum8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum8.SetGetter(
+                CompiledModelTestBase.Enum8? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum8(instance).HasValue));
+            nullableEnum8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8(instance) = (value == null ? value : ((CompiledModelTestBase.Enum8? )(((CompiledModelTestBase.Enum8)value))));
+                    return instance;
+                });
+            nullableEnum8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8(instance) = (value == null ? value : ((CompiledModelTestBase.Enum8? )(((CompiledModelTestBase.Enum8)value))));
+                    return instance;
+                });
+            nullableEnum8.SetAccessors(
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8?>(nullableEnum8, 138),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8));
+            nullableEnum8.SetPropertyIndexes(
+                index: 138,
+                originalValueIndex: 138,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                    short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                    CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))));
+            nullableEnum8.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8.TypeMapping.Comparer));
+            nullableEnum8.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8.TypeMapping.KeyComparer));
+
+            var nullableEnum8Array = runtimeEntityType.AddProperty(
+                "NullableEnum8Array",
+                typeof(CompiledModelTestBase.Enum8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8Array.SetGetter(
+                CompiledModelTestBase.Enum8? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8Array(instance) == null);
+            nullableEnum8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8Array(instance) = value;
+                    return instance;
+                });
+            nullableEnum8Array.SetAccessors(
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8? []>(nullableEnum8Array, 139),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8Array));
+            nullableEnum8Array.SetPropertyIndexes(
+                index: 139,
+                originalValueIndex: 139,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var nullableEnum8ArrayElementType = nullableEnum8Array.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+            nullableEnum8ArrayElementType.TypeMapping = nullableEnum8Array.TypeMapping.ElementTypeMapping;
+            nullableEnum8ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum8AsString = runtimeEntityType.AddProperty(
+                "NullableEnum8AsString",
+                typeof(CompiledModelTestBase.Enum8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum8AsString.SetGetter(
+                CompiledModelTestBase.Enum8? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnum8AsString(instance).HasValue));
+            nullableEnum8AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum8? )(((CompiledModelTestBase.Enum8)value))));
+                    return instance;
+                });
+            nullableEnum8AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsString(instance) = (value == null ? value : ((CompiledModelTestBase.Enum8? )(((CompiledModelTestBase.Enum8)value))));
+                    return instance;
+                });
+            nullableEnum8AsString.SetAccessors(
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8?>(nullableEnum8AsString, 140),
+                CompiledModelTestBase.Enum8? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8AsString));
+            nullableEnum8AsString.SetPropertyIndexes(
+                index: 140,
+                originalValueIndex: 140,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8AsString.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                    short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                    CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))));
+            nullableEnum8AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8AsString.TypeMapping.Comparer));
+            nullableEnum8AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8AsString.TypeMapping.KeyComparer));
+
+            var nullableEnum8AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum8AsStringArray",
+                typeof(CompiledModelTestBase.Enum8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8AsStringArray.SetGetter(
+                CompiledModelTestBase.Enum8? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(instance) == null);
+            nullableEnum8AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum8AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.Enum8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnum8AsStringArray.SetAccessors(
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.Enum8? []>(nullableEnum8AsStringArray, 141),
+                CompiledModelTestBase.Enum8? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8AsStringArray));
+            nullableEnum8AsStringArray.SetPropertyIndexes(
+                index: 141,
+                originalValueIndex: 141,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var nullableEnum8AsStringArrayElementType = nullableEnum8AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+            nullableEnum8AsStringArrayElementType.TypeMapping = nullableEnum8AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnum8AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnum8AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum8AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.Enum8?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(instance) == null);
+            nullableEnum8AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum8AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnum8AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8AsStringCollection, 142),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8AsStringCollection));
+            nullableEnum8AsStringCollection.SetPropertyIndexes(
+                index: 142,
+                originalValueIndex: 142,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var nullableEnum8AsStringCollectionElementType = nullableEnum8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+            nullableEnum8AsStringCollectionElementType.TypeMapping = nullableEnum8AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnum8AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnum8Collection = runtimeEntityType.AddProperty(
+                "NullableEnum8Collection",
+                typeof(List<CompiledModelTestBase.Enum8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8Collection.SetGetter(
+                List<CompiledModelTestBase.Enum8?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnum8Collection(instance) == null);
+            nullableEnum8Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum8Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.Enum8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnum8Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnum8Collection.SetAccessors(
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnum8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8Collection, 143),
+                List<CompiledModelTestBase.Enum8?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8Collection));
+            nullableEnum8Collection.SetPropertyIndexes(
+                index: 143,
+                originalValueIndex: 143,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnum8Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(new NullableValueComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        bool (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.Enum8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.Enum8 (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                        short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                        CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, short>(
+                            short (CompiledModelTestBase.Enum8 value) => ((short)value),
+                            CompiledModelTestBase.Enum8 (short value) => ((CompiledModelTestBase.Enum8)value)))));
+            var nullableEnum8CollectionElementType = nullableEnum8Collection.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+            nullableEnum8CollectionElementType.TypeMapping = nullableEnum8Collection.TypeMapping.ElementTypeMapping;
+            nullableEnum8CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.Enum8>(nullableEnum8CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU16 = runtimeEntityType.AddProperty(
+                "NullableEnumU16",
+                typeof(CompiledModelTestBase.EnumU16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU16.SetGetter(
+                CompiledModelTestBase.EnumU16? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU16(instance).HasValue));
+            nullableEnumU16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU16? )(((CompiledModelTestBase.EnumU16)value))));
+                    return instance;
+                });
+            nullableEnumU16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU16? )(((CompiledModelTestBase.EnumU16)value))));
+                    return instance;
+                });
+            nullableEnumU16.SetAccessors(
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16, 144),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16));
+            nullableEnumU16.SetPropertyIndexes(
+                index: 144,
+                originalValueIndex: 144,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                    int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                    CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))));
+            nullableEnumU16.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16.TypeMapping.Comparer));
+            nullableEnumU16.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16.TypeMapping.KeyComparer));
+
+            var nullableEnumU16Array = runtimeEntityType.AddProperty(
+                "NullableEnumU16Array",
+                typeof(CompiledModelTestBase.EnumU16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16Array.SetGetter(
+                CompiledModelTestBase.EnumU16? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16Array(instance) == null);
+            nullableEnumU16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16Array.SetAccessors(
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16Array, 145),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16Array));
+            nullableEnumU16Array.SetPropertyIndexes(
+                index: 145,
+                originalValueIndex: 145,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var nullableEnumU16ArrayElementType = nullableEnumU16Array.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+            nullableEnumU16ArrayElementType.TypeMapping = nullableEnumU16Array.TypeMapping.ElementTypeMapping;
+            nullableEnumU16ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU16AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsString",
+                typeof(CompiledModelTestBase.EnumU16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU16AsString.SetGetter(
+                CompiledModelTestBase.EnumU16? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU16AsString(instance).HasValue));
+            nullableEnumU16AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU16? )(((CompiledModelTestBase.EnumU16)value))));
+                    return instance;
+                });
+            nullableEnumU16AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU16? )(((CompiledModelTestBase.EnumU16)value))));
+                    return instance;
+                });
+            nullableEnumU16AsString.SetAccessors(
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16AsString, 146),
+                CompiledModelTestBase.EnumU16? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16AsString));
+            nullableEnumU16AsString.SetPropertyIndexes(
+                index: 146,
+                originalValueIndex: 146,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16AsString.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                    int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                    CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))));
+            nullableEnumU16AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16AsString.TypeMapping.Comparer));
+            nullableEnumU16AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16AsString.TypeMapping.KeyComparer));
+
+            var nullableEnumU16AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsStringArray",
+                typeof(CompiledModelTestBase.EnumU16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU16? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(instance) == null);
+            nullableEnumU16AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU16? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16AsStringArray, 147),
+                CompiledModelTestBase.EnumU16? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16AsStringArray));
+            nullableEnumU16AsStringArray.SetPropertyIndexes(
+                index: 147,
+                originalValueIndex: 147,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var nullableEnumU16AsStringArrayElementType = nullableEnumU16AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+            nullableEnumU16AsStringArrayElementType.TypeMapping = nullableEnumU16AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnumU16AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU16AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU16?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(instance) == null);
+            nullableEnumU16AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16AsStringCollection, 148),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16AsStringCollection));
+            nullableEnumU16AsStringCollection.SetPropertyIndexes(
+                index: 148,
+                originalValueIndex: 148,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var nullableEnumU16AsStringCollectionElementType = nullableEnumU16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+            nullableEnumU16AsStringCollectionElementType.TypeMapping = nullableEnumU16AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnumU16AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU16Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU16Collection",
+                typeof(List<CompiledModelTestBase.EnumU16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU16?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU16Collection(instance) == null);
+            nullableEnumU16Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU16?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU16Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU16Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU16Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16Collection, 149),
+                List<CompiledModelTestBase.EnumU16?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16Collection));
+            nullableEnumU16Collection.SetPropertyIndexes(
+                index: 149,
+                originalValueIndex: 149,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU16Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(new NullableValueComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        bool (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU16 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU16 (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                        int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                        CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, int>(
+                            int (CompiledModelTestBase.EnumU16 value) => ((int)value),
+                            CompiledModelTestBase.EnumU16 (int value) => ((CompiledModelTestBase.EnumU16)value)))));
+            var nullableEnumU16CollectionElementType = nullableEnumU16Collection.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+            nullableEnumU16CollectionElementType.TypeMapping = nullableEnumU16Collection.TypeMapping.ElementTypeMapping;
+            nullableEnumU16CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU16>(nullableEnumU16CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU32 = runtimeEntityType.AddProperty(
+                "NullableEnumU32",
+                typeof(CompiledModelTestBase.EnumU32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU32.SetGetter(
+                CompiledModelTestBase.EnumU32? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU32(instance).HasValue));
+            nullableEnumU32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU32? )(((CompiledModelTestBase.EnumU32)value))));
+                    return instance;
+                });
+            nullableEnumU32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU32? )(((CompiledModelTestBase.EnumU32)value))));
+                    return instance;
+                });
+            nullableEnumU32.SetAccessors(
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32, 150),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32));
+            nullableEnumU32.SetPropertyIndexes(
+                index: 150,
+                originalValueIndex: 150,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                    long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                    CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))));
+            nullableEnumU32.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32.TypeMapping.Comparer));
+            nullableEnumU32.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32.TypeMapping.KeyComparer));
+
+            var nullableEnumU32Array = runtimeEntityType.AddProperty(
+                "NullableEnumU32Array",
+                typeof(CompiledModelTestBase.EnumU32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32Array.SetGetter(
+                CompiledModelTestBase.EnumU32? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32Array(instance) == null);
+            nullableEnumU32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32Array.SetAccessors(
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32Array, 151),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32Array));
+            nullableEnumU32Array.SetPropertyIndexes(
+                index: 151,
+                originalValueIndex: 151,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var nullableEnumU32ArrayElementType = nullableEnumU32Array.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+            nullableEnumU32ArrayElementType.TypeMapping = nullableEnumU32Array.TypeMapping.ElementTypeMapping;
+            nullableEnumU32ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU32AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsString",
+                typeof(CompiledModelTestBase.EnumU32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU32AsString.SetGetter(
+                CompiledModelTestBase.EnumU32? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU32AsString(instance).HasValue));
+            nullableEnumU32AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU32? )(((CompiledModelTestBase.EnumU32)value))));
+                    return instance;
+                });
+            nullableEnumU32AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU32? )(((CompiledModelTestBase.EnumU32)value))));
+                    return instance;
+                });
+            nullableEnumU32AsString.SetAccessors(
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32AsString, 152),
+                CompiledModelTestBase.EnumU32? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32AsString));
+            nullableEnumU32AsString.SetPropertyIndexes(
+                index: 152,
+                originalValueIndex: 152,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32AsString.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                    long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                    CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))));
+            nullableEnumU32AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32AsString.TypeMapping.Comparer));
+            nullableEnumU32AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32AsString.TypeMapping.KeyComparer));
+
+            var nullableEnumU32AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsStringArray",
+                typeof(CompiledModelTestBase.EnumU32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU32? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(instance) == null);
+            nullableEnumU32AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU32? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32AsStringArray, 153),
+                CompiledModelTestBase.EnumU32? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32AsStringArray));
+            nullableEnumU32AsStringArray.SetPropertyIndexes(
+                index: 153,
+                originalValueIndex: 153,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var nullableEnumU32AsStringArrayElementType = nullableEnumU32AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+            nullableEnumU32AsStringArrayElementType.TypeMapping = nullableEnumU32AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnumU32AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU32AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU32?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(instance) == null);
+            nullableEnumU32AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32AsStringCollection, 154),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32AsStringCollection));
+            nullableEnumU32AsStringCollection.SetPropertyIndexes(
+                index: 154,
+                originalValueIndex: 154,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var nullableEnumU32AsStringCollectionElementType = nullableEnumU32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+            nullableEnumU32AsStringCollectionElementType.TypeMapping = nullableEnumU32AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnumU32AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU32Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU32Collection",
+                typeof(List<CompiledModelTestBase.EnumU32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU32?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU32Collection(instance) == null);
+            nullableEnumU32Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU32?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU32Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU32Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU32Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32Collection, 155),
+                List<CompiledModelTestBase.EnumU32?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32Collection));
+            nullableEnumU32Collection.SetPropertyIndexes(
+                index: 155,
+                originalValueIndex: 155,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU32Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(new NullableValueComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        bool (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU32 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU32 (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                        long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                        CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, long>(
+                            long (CompiledModelTestBase.EnumU32 value) => ((long)value),
+                            CompiledModelTestBase.EnumU32 (long value) => ((CompiledModelTestBase.EnumU32)value)))));
+            var nullableEnumU32CollectionElementType = nullableEnumU32Collection.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+            nullableEnumU32CollectionElementType.TypeMapping = nullableEnumU32Collection.TypeMapping.ElementTypeMapping;
+            nullableEnumU32CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU32>(nullableEnumU32CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU64 = runtimeEntityType.AddProperty(
+                "NullableEnumU64",
+                typeof(CompiledModelTestBase.EnumU64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU64.SetGetter(
+                CompiledModelTestBase.EnumU64? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU64(instance).HasValue));
+            nullableEnumU64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU64? )(((CompiledModelTestBase.EnumU64)value))));
+                    return instance;
+                });
+            nullableEnumU64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU64? )(((CompiledModelTestBase.EnumU64)value))));
+                    return instance;
+                });
+            nullableEnumU64.SetAccessors(
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64, 156),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64));
+            nullableEnumU64.SetPropertyIndexes(
+                index: 156,
+                originalValueIndex: 156,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                    decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                    CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))));
+            nullableEnumU64.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64.TypeMapping.Comparer));
+            nullableEnumU64.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64.TypeMapping.KeyComparer));
+
+            var nullableEnumU64Array = runtimeEntityType.AddProperty(
+                "NullableEnumU64Array",
+                typeof(CompiledModelTestBase.EnumU64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64Array.SetGetter(
+                CompiledModelTestBase.EnumU64? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64Array(instance) == null);
+            nullableEnumU64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64Array.SetAccessors(
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64Array, 157),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64Array));
+            nullableEnumU64Array.SetPropertyIndexes(
+                index: 157,
+                originalValueIndex: 157,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var nullableEnumU64ArrayElementType = nullableEnumU64Array.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+            nullableEnumU64ArrayElementType.TypeMapping = nullableEnumU64Array.TypeMapping.ElementTypeMapping;
+            nullableEnumU64ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU64AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsString",
+                typeof(CompiledModelTestBase.EnumU64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU64AsString.SetGetter(
+                CompiledModelTestBase.EnumU64? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU64AsString(instance).HasValue));
+            nullableEnumU64AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU64? )(((CompiledModelTestBase.EnumU64)value))));
+                    return instance;
+                });
+            nullableEnumU64AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU64? )(((CompiledModelTestBase.EnumU64)value))));
+                    return instance;
+                });
+            nullableEnumU64AsString.SetAccessors(
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64AsString, 158),
+                CompiledModelTestBase.EnumU64? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64AsString));
+            nullableEnumU64AsString.SetPropertyIndexes(
+                index: 158,
+                originalValueIndex: 158,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64AsString.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                    decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                    CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))));
+            nullableEnumU64AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64AsString.TypeMapping.Comparer));
+            nullableEnumU64AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64AsString.TypeMapping.KeyComparer));
+
+            var nullableEnumU64AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsStringArray",
+                typeof(CompiledModelTestBase.EnumU64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU64? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(instance) == null);
+            nullableEnumU64AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU64? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64AsStringArray, 159),
+                CompiledModelTestBase.EnumU64? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64AsStringArray));
+            nullableEnumU64AsStringArray.SetPropertyIndexes(
+                index: 159,
+                originalValueIndex: 159,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var nullableEnumU64AsStringArrayElementType = nullableEnumU64AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+            nullableEnumU64AsStringArrayElementType.TypeMapping = nullableEnumU64AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnumU64AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU64AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU64?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(instance) == null);
+            nullableEnumU64AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64AsStringCollection, 160),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64AsStringCollection));
+            nullableEnumU64AsStringCollection.SetPropertyIndexes(
+                index: 160,
+                originalValueIndex: 160,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var nullableEnumU64AsStringCollectionElementType = nullableEnumU64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+            nullableEnumU64AsStringCollectionElementType.TypeMapping = nullableEnumU64AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnumU64AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU64Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU64Collection",
+                typeof(List<CompiledModelTestBase.EnumU64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU64?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU64Collection(instance) == null);
+            nullableEnumU64Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU64?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU64Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU64Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU64Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64Collection, 161),
+                List<CompiledModelTestBase.EnumU64?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64Collection));
+            nullableEnumU64Collection.SetPropertyIndexes(
+                index: 161,
+                originalValueIndex: 161,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU64Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(new NullableValueComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value))))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        bool (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU64 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU64 (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                        decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                        CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, decimal>(
+                            decimal (CompiledModelTestBase.EnumU64 value) => ((decimal)(((long)value))),
+                            CompiledModelTestBase.EnumU64 (decimal value) => ((CompiledModelTestBase.EnumU64)(((long)value)))))));
+            var nullableEnumU64CollectionElementType = nullableEnumU64Collection.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+            nullableEnumU64CollectionElementType.TypeMapping = nullableEnumU64Collection.TypeMapping.ElementTypeMapping;
+            nullableEnumU64CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU64>(nullableEnumU64CollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU8 = runtimeEntityType.AddProperty(
+                "NullableEnumU8",
+                typeof(CompiledModelTestBase.EnumU8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU8.SetGetter(
+                CompiledModelTestBase.EnumU8? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU8(instance).HasValue));
+            nullableEnumU8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU8? )(((CompiledModelTestBase.EnumU8)value))));
+                    return instance;
+                });
+            nullableEnumU8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU8? )(((CompiledModelTestBase.EnumU8)value))));
+                    return instance;
+                });
+            nullableEnumU8.SetAccessors(
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8, 162),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8));
+            nullableEnumU8.SetPropertyIndexes(
+                index: 162,
+                originalValueIndex: 162,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                    byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                    CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))));
+            nullableEnumU8.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8.TypeMapping.Comparer));
+            nullableEnumU8.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8.TypeMapping.KeyComparer));
+
+            var nullableEnumU8Array = runtimeEntityType.AddProperty(
+                "NullableEnumU8Array",
+                typeof(CompiledModelTestBase.EnumU8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8Array.SetGetter(
+                CompiledModelTestBase.EnumU8? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8Array(instance) == null);
+            nullableEnumU8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8Array(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8Array.SetAccessors(
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8Array, 163),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8Array));
+            nullableEnumU8Array.SetPropertyIndexes(
+                index: 163,
+                originalValueIndex: 163,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var nullableEnumU8ArrayElementType = nullableEnumU8Array.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+            nullableEnumU8ArrayElementType.TypeMapping = nullableEnumU8Array.TypeMapping.ElementTypeMapping;
+            nullableEnumU8ArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8ArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU8AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsString",
+                typeof(CompiledModelTestBase.EnumU8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU8AsString.SetGetter(
+                CompiledModelTestBase.EnumU8? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableEnumU8AsString(instance).HasValue));
+            nullableEnumU8AsString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU8? )(((CompiledModelTestBase.EnumU8)value))));
+                    return instance;
+                });
+            nullableEnumU8AsString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsString(instance) = (value == null ? value : ((CompiledModelTestBase.EnumU8? )(((CompiledModelTestBase.EnumU8)value))));
+                    return instance;
+                });
+            nullableEnumU8AsString.SetAccessors(
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8AsString, 164),
+                CompiledModelTestBase.EnumU8? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8AsString));
+            nullableEnumU8AsString.SetPropertyIndexes(
+                index: 164,
+                originalValueIndex: 164,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8AsString.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                    byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                    CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))));
+            nullableEnumU8AsString.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8AsString.TypeMapping.Comparer));
+            nullableEnumU8AsString.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8AsString.TypeMapping.KeyComparer));
+
+            var nullableEnumU8AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsStringArray",
+                typeof(CompiledModelTestBase.EnumU8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8AsStringArray.SetGetter(
+                CompiledModelTestBase.EnumU8? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(instance) == null);
+            nullableEnumU8AsStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8AsStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, CompiledModelTestBase.EnumU8? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8AsStringArray.SetAccessors(
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8AsStringArray, 165),
+                CompiledModelTestBase.EnumU8? [] (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8AsStringArray));
+            nullableEnumU8AsStringArray.SetPropertyIndexes(
+                index: 165,
+                originalValueIndex: 165,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8AsStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var nullableEnumU8AsStringArrayElementType = nullableEnumU8AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+            nullableEnumU8AsStringArrayElementType.TypeMapping = nullableEnumU8AsStringArray.TypeMapping.ElementTypeMapping;
+            nullableEnumU8AsStringArrayElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8AsStringArrayElementType.TypeMapping.Comparer));
+
+            var nullableEnumU8AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8AsStringCollection.SetGetter(
+                List<CompiledModelTestBase.EnumU8?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(instance) == null);
+            nullableEnumU8AsStringCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8AsStringCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8AsStringCollection.SetAccessors(
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8AsStringCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8AsStringCollection, 166),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8AsStringCollection));
+            nullableEnumU8AsStringCollection.SetPropertyIndexes(
+                index: 166,
+                originalValueIndex: 166,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8AsStringCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var nullableEnumU8AsStringCollectionElementType = nullableEnumU8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+            nullableEnumU8AsStringCollectionElementType.TypeMapping = nullableEnumU8AsStringCollection.TypeMapping.ElementTypeMapping;
+            nullableEnumU8AsStringCollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8AsStringCollectionElementType.TypeMapping.Comparer));
+
+            var nullableEnumU8Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU8Collection",
+                typeof(List<CompiledModelTestBase.EnumU8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8Collection.SetGetter(
+                List<CompiledModelTestBase.EnumU8?> (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8Collection(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableEnumU8Collection(instance) == null);
+            nullableEnumU8Collection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8Collection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, List<CompiledModelTestBase.EnumU8?> value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableEnumU8Collection(instance) = value;
+                    return instance;
+                });
+            nullableEnumU8Collection.SetAccessors(
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableEnumU8Collection(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => entry.ReadOriginalValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8Collection, 167),
+                List<CompiledModelTestBase.EnumU8?> (IInternalEntry entry) => entry.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8Collection));
+            nullableEnumU8Collection.SetPropertyIndexes(
+                index: 167,
+                originalValueIndex: 167,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableEnumU8Collection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(new NullableValueComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        bool (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals(((object)v1), ((object)v2)),
+                        int (CompiledModelTestBase.EnumU8 v) => ((object)v).GetHashCode(),
+                        CompiledModelTestBase.EnumU8 (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                        CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            byte (CompiledModelTestBase.EnumU8 value) => ((byte)value),
+                            CompiledModelTestBase.EnumU8 (byte value) => ((CompiledModelTestBase.EnumU8)value)))));
+            var nullableEnumU8CollectionElementType = nullableEnumU8Collection.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+            nullableEnumU8CollectionElementType.TypeMapping = nullableEnumU8Collection.TypeMapping.ElementTypeMapping;
+            nullableEnumU8CollectionElementType.SetComparer(new NullableValueComparer<CompiledModelTestBase.EnumU8>(nullableEnumU8CollectionElementType.TypeMapping.Comparer));
+
+            var nullableFloat = runtimeEntityType.AddProperty(
+                "NullableFloat",
+                typeof(float?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableFloat", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableFloat>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableFloat.SetGetter(
+                float? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableFloat(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableFloat(instance).HasValue));
+            nullableFloat.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableFloat(instance) = value;
+                    return instance;
+                });
+            nullableFloat.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableFloat(instance) = value;
+                    return instance;
+                });
+            nullableFloat.SetAccessors(
+                float? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableFloat(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableFloat(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float? (IInternalEntry entry) => entry.ReadOriginalValue<float?>(nullableFloat, 168),
+                float? (IInternalEntry entry) => entry.GetCurrentValue<float?>(nullableFloat));
+            nullableFloat.SetPropertyIndexes(
+                index: 168,
+                originalValueIndex: 168,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableFloat.TypeMapping = JetFloatTypeMapping.Default.Clone(
+                comparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v),
+                keyComparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v),
+                providerValueComparer: new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v));
+            nullableFloat.SetComparer(new NullableValueComparer<float>(nullableFloat.TypeMapping.Comparer));
+            nullableFloat.SetKeyComparer(new NullableValueComparer<float>(nullableFloat.TypeMapping.KeyComparer));
+
+            var nullableFloatArray = runtimeEntityType.AddProperty(
+                "NullableFloatArray",
+                typeof(float?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableFloatArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableFloatArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableFloatArray.SetGetter(
+                float? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableFloatArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableFloatArray(instance) == null);
+            nullableFloatArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableFloatArray(instance) = value;
+                    return instance;
+                });
+            nullableFloatArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, float? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableFloatArray(instance) = value;
+                    return instance;
+                });
+            nullableFloatArray.SetAccessors(
+                float? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableFloatArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableFloatArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                float? [] (IInternalEntry entry) => entry.ReadOriginalValue<float? []>(nullableFloatArray, 169),
+                float? [] (IInternalEntry entry) => entry.GetCurrentValue<float? []>(nullableFloatArray));
+            nullableFloatArray.SetPropertyIndexes(
+                index: 169,
+                originalValueIndex: 169,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableFloatArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<float?[], float>(new NullableValueComparer<float>(new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<float?[], float>(new NullableValueComparer<float>(new ValueComparer<float>(
+                    bool (float v1, float v2) => v1.Equals(v2),
+                    int (float v) => ((object)v).GetHashCode(),
+                    float (float v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<float?>(new JsonCollectionOfNullableStructsReaderWriter<float?[], float>(
+                    JsonFloatReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<float?[], float>(
+                    JsonFloatReaderWriter.Instance),
+                elementMapping: JetFloatTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v),
+                    keyComparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v),
+                    providerValueComparer: new ValueComparer<float>(
+                        bool (float v1, float v2) => v1.Equals(v2),
+                        int (float v) => ((object)v).GetHashCode(),
+                        float (float v) => v)));
+            var nullableFloatArrayElementType = nullableFloatArray.SetElementType(typeof(float?),
+                nullable: true);
+            nullableFloatArrayElementType.TypeMapping = nullableFloatArray.TypeMapping.ElementTypeMapping;
+            nullableFloatArrayElementType.SetComparer(new NullableValueComparer<float>(nullableFloatArrayElementType.TypeMapping.Comparer));
+
+            var nullableGuid = runtimeEntityType.AddProperty(
+                "NullableGuid",
+                typeof(Guid?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableGuid", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableGuid>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableGuid.SetGetter(
+                Guid? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableGuid(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableGuid(instance).HasValue));
+            nullableGuid.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableGuid(instance) = value;
+                    return instance;
+                });
+            nullableGuid.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableGuid(instance) = value;
+                    return instance;
+                });
+            nullableGuid.SetAccessors(
+                Guid? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableGuid(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableGuid(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid? (IInternalEntry entry) => entry.ReadOriginalValue<Guid?>(nullableGuid, 170),
+                Guid? (IInternalEntry entry) => entry.GetCurrentValue<Guid?>(nullableGuid));
+            nullableGuid.SetPropertyIndexes(
+                index: 170,
+                originalValueIndex: 170,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableGuid.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            nullableGuid.SetComparer(new NullableValueComparer<Guid>(nullableGuid.TypeMapping.Comparer));
+            nullableGuid.SetKeyComparer(new NullableValueComparer<Guid>(nullableGuid.TypeMapping.KeyComparer));
+
+            var nullableGuidArray = runtimeEntityType.AddProperty(
+                "NullableGuidArray",
+                typeof(Guid?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableGuidArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableGuidArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableGuidArray.SetGetter(
+                Guid? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableGuidArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableGuidArray(instance) == null);
+            nullableGuidArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableGuidArray(instance) = value;
+                    return instance;
+                });
+            nullableGuidArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Guid? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableGuidArray(instance) = value;
+                    return instance;
+                });
+            nullableGuidArray.SetAccessors(
+                Guid? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableGuidArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableGuidArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Guid? [] (IInternalEntry entry) => entry.ReadOriginalValue<Guid? []>(nullableGuidArray, 171),
+                Guid? [] (IInternalEntry entry) => entry.GetCurrentValue<Guid? []>(nullableGuidArray));
+            nullableGuidArray.SetPropertyIndexes(
+                index: 171,
+                originalValueIndex: 171,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableGuidArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<Guid?[], Guid>(new NullableValueComparer<Guid>(new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<Guid?[], Guid>(new NullableValueComparer<Guid>(new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<Guid?>(new JsonCollectionOfNullableStructsReaderWriter<Guid?[], Guid>(
+                    JsonGuidReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<Guid?[], Guid>(
+                    JsonGuidReaderWriter.Instance),
+                elementMapping: JetGuidTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v),
+                    keyComparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v),
+                    providerValueComparer: new ValueComparer<Guid>(
+                        bool (Guid v1, Guid v2) => v1 == v2,
+                        int (Guid v) => ((object)v).GetHashCode(),
+                        Guid (Guid v) => v)));
+            var nullableGuidArrayElementType = nullableGuidArray.SetElementType(typeof(Guid?),
+                nullable: true);
+            nullableGuidArrayElementType.TypeMapping = nullableGuidArray.TypeMapping.ElementTypeMapping;
+            nullableGuidArrayElementType.SetComparer(new NullableValueComparer<Guid>(nullableGuidArrayElementType.TypeMapping.Comparer));
+
+            var nullableIPAddress = runtimeEntityType.AddProperty(
+                "NullableIPAddress",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableIPAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableIPAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableIPAddress.SetGetter(
+                IPAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableIPAddress(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableIPAddress(instance) == null);
+            nullableIPAddress.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableIPAddress(instance) = value;
+                    return instance;
+                });
+            nullableIPAddress.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableIPAddress(instance) = value;
+                    return instance;
+                });
+            nullableIPAddress.SetAccessors(
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableIPAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableIPAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress>(nullableIPAddress, 172),
+                IPAddress (IInternalEntry entry) => entry.GetCurrentValue<IPAddress>(nullableIPAddress));
+            nullableIPAddress.SetPropertyIndexes(
+                index: 172,
+                originalValueIndex: 172,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableIPAddress.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(45)",
+                    size: 45),
+                converter: new ValueConverter<IPAddress, string>(
+                    string (IPAddress v) => ((object)v).ToString(),
+                    IPAddress (string v) => IPAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v))));
+
+            var nullableIPAddressArray = runtimeEntityType.AddProperty(
+                "NullableIPAddressArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableIPAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableIPAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableIPAddressArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableIPAddressArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableIPAddressArray(instance) == null);
+            nullableIPAddressArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableIPAddressArray(instance) = value;
+                    return instance;
+                });
+            nullableIPAddressArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IPAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableIPAddressArray(instance) = value;
+                    return instance;
+                });
+            nullableIPAddressArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableIPAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableIPAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(nullableIPAddressArray, 173),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(nullableIPAddressArray));
+            nullableIPAddressArray.SetPropertyIndexes(
+                index: 173,
+                originalValueIndex: 173,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableIPAddressArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var nullableIPAddressArrayElementType = nullableIPAddressArray.SetElementType(typeof(IPAddress),
+                nullable: true);
+            nullableIPAddressArrayElementType.TypeMapping = nullableIPAddressArray.TypeMapping.ElementTypeMapping;
+
+            var nullableInt16 = runtimeEntityType.AddProperty(
+                "NullableInt16",
+                typeof(short?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt16.SetGetter(
+                short? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableInt16(instance).HasValue));
+            nullableInt16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt16(instance) = value;
+                    return instance;
+                });
+            nullableInt16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt16(instance) = value;
+                    return instance;
+                });
+            nullableInt16.SetAccessors(
+                short? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short? (IInternalEntry entry) => entry.ReadOriginalValue<short?>(nullableInt16, 174),
+                short? (IInternalEntry entry) => entry.GetCurrentValue<short?>(nullableInt16));
+            nullableInt16.SetPropertyIndexes(
+                index: 174,
+                originalValueIndex: 174,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt16.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                keyComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v));
+            nullableInt16.SetComparer(new NullableValueComparer<short>(nullableInt16.TypeMapping.Comparer));
+            nullableInt16.SetKeyComparer(new NullableValueComparer<short>(nullableInt16.TypeMapping.KeyComparer));
+
+            var nullableInt16Array = runtimeEntityType.AddProperty(
+                "NullableInt16Array",
+                typeof(short?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt16Array.SetGetter(
+                short? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt16Array(instance) == null);
+            nullableInt16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt16Array(instance) = value;
+                    return instance;
+                });
+            nullableInt16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, short? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt16Array(instance) = value;
+                    return instance;
+                });
+            nullableInt16Array.SetAccessors(
+                short? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                short? [] (IInternalEntry entry) => entry.ReadOriginalValue<short? []>(nullableInt16Array, 175),
+                short? [] (IInternalEntry entry) => entry.GetCurrentValue<short? []>(nullableInt16Array));
+            nullableInt16Array.SetPropertyIndexes(
+                index: 175,
+                originalValueIndex: 175,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<short?[], short>(new NullableValueComparer<short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<short?[], short>(new NullableValueComparer<short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short?>(new JsonCollectionOfNullableStructsReaderWriter<short?[], short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<short?[], short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var nullableInt16ArrayElementType = nullableInt16Array.SetElementType(typeof(short?),
+                nullable: true);
+            nullableInt16ArrayElementType.TypeMapping = nullableInt16Array.TypeMapping.ElementTypeMapping;
+            nullableInt16ArrayElementType.SetComparer(new NullableValueComparer<short>(nullableInt16ArrayElementType.TypeMapping.Comparer));
+
+            var nullableInt32 = runtimeEntityType.AddProperty(
+                "NullableInt32",
+                typeof(int?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt32.SetGetter(
+                int? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableInt32(instance).HasValue));
+            nullableInt32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt32(instance) = value;
+                    return instance;
+                });
+            nullableInt32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt32(instance) = value;
+                    return instance;
+                });
+            nullableInt32.SetAccessors(
+                int? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? (IInternalEntry entry) => entry.ReadOriginalValue<int?>(nullableInt32, 176),
+                int? (IInternalEntry entry) => entry.GetCurrentValue<int?>(nullableInt32));
+            nullableInt32.SetPropertyIndexes(
+                index: 176,
+                originalValueIndex: 176,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt32.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+            nullableInt32.SetComparer(new NullableValueComparer<int>(nullableInt32.TypeMapping.Comparer));
+            nullableInt32.SetKeyComparer(new NullableValueComparer<int>(nullableInt32.TypeMapping.KeyComparer));
+
+            var nullableInt32Array = runtimeEntityType.AddProperty(
+                "NullableInt32Array",
+                typeof(int?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt32Array.SetGetter(
+                int? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt32Array(instance) == null);
+            nullableInt32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt32Array(instance) = value;
+                    return instance;
+                });
+            nullableInt32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, int? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt32Array(instance) = value;
+                    return instance;
+                });
+            nullableInt32Array.SetAccessors(
+                int? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                int? [] (IInternalEntry entry) => entry.ReadOriginalValue<int? []>(nullableInt32Array, 177),
+                int? [] (IInternalEntry entry) => entry.GetCurrentValue<int? []>(nullableInt32Array));
+            nullableInt32Array.SetPropertyIndexes(
+                index: 177,
+                originalValueIndex: 177,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<int?[], int>(new NullableValueComparer<int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<int?[], int>(new NullableValueComparer<int>(new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<int?>(new JsonCollectionOfNullableStructsReaderWriter<int?[], int>(
+                    JsonInt32ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<int?[], int>(
+                    JsonInt32ReaderWriter.Instance),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v)));
+            var nullableInt32ArrayElementType = nullableInt32Array.SetElementType(typeof(int?),
+                nullable: true);
+            nullableInt32ArrayElementType.TypeMapping = nullableInt32Array.TypeMapping.ElementTypeMapping;
+            nullableInt32ArrayElementType.SetComparer(new NullableValueComparer<int>(nullableInt32ArrayElementType.TypeMapping.Comparer));
+
+            var nullableInt64 = runtimeEntityType.AddProperty(
+                "NullableInt64",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt64.SetGetter(
+                long? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableInt64(instance).HasValue));
+            nullableInt64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt64(instance) = value;
+                    return instance;
+                });
+            nullableInt64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt64(instance) = value;
+                    return instance;
+                });
+            nullableInt64.SetAccessors(
+                long? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(nullableInt64, 178),
+                long? (IInternalEntry entry) => entry.GetCurrentValue<long?>(nullableInt64));
+            nullableInt64.SetPropertyIndexes(
+                index: 178,
+                originalValueIndex: 178,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt64.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            nullableInt64.SetComparer(new NullableValueComparer<long>(nullableInt64.TypeMapping.Comparer));
+            nullableInt64.SetKeyComparer(new NullableValueComparer<long>(nullableInt64.TypeMapping.KeyComparer));
+
+            var nullableInt64Array = runtimeEntityType.AddProperty(
+                "NullableInt64Array",
+                typeof(long?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt64Array.SetGetter(
+                long? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt64Array(instance) == null);
+            nullableInt64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt64Array(instance) = value;
+                    return instance;
+                });
+            nullableInt64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, long? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt64Array(instance) = value;
+                    return instance;
+                });
+            nullableInt64Array.SetAccessors(
+                long? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                long? [] (IInternalEntry entry) => entry.ReadOriginalValue<long? []>(nullableInt64Array, 179),
+                long? [] (IInternalEntry entry) => entry.GetCurrentValue<long? []>(nullableInt64Array));
+            nullableInt64Array.SetPropertyIndexes(
+                index: 179,
+                originalValueIndex: 179,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<long?[], long>(new NullableValueComparer<long>(new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<long?[], long>(new NullableValueComparer<long>(new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<long?>(new JsonCollectionOfNullableStructsReaderWriter<long?[], long>(
+                    JsonInt64ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<long?[], long>(
+                    JsonInt64ReaderWriter.Instance),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    keyComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v)));
+            var nullableInt64ArrayElementType = nullableInt64Array.SetElementType(typeof(long?),
+                nullable: true);
+            nullableInt64ArrayElementType.TypeMapping = nullableInt64Array.TypeMapping.ElementTypeMapping;
+            nullableInt64ArrayElementType.SetComparer(new NullableValueComparer<long>(nullableInt64ArrayElementType.TypeMapping.Comparer));
+
+            var nullableInt8 = runtimeEntityType.AddProperty(
+                "NullableInt8",
+                typeof(sbyte?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt8.SetGetter(
+                sbyte? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableInt8(instance).HasValue));
+            nullableInt8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt8(instance) = value;
+                    return instance;
+                });
+            nullableInt8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt8(instance) = value;
+                    return instance;
+                });
+            nullableInt8.SetAccessors(
+                sbyte? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte? (IInternalEntry entry) => entry.ReadOriginalValue<sbyte?>(nullableInt8, 180),
+                sbyte? (IInternalEntry entry) => entry.GetCurrentValue<sbyte?>(nullableInt8));
+            nullableInt8.SetPropertyIndexes(
+                index: 180,
+                originalValueIndex: 180,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt8.TypeMapping = ShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v),
+                keyComparer: new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v),
+                converter: new ValueConverter<sbyte, short>(
+                    short (sbyte v) => ((short)v),
+                    sbyte (short v) => ((sbyte)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<sbyte, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<sbyte, short>(
+                        short (sbyte v) => ((short)v),
+                        sbyte (short v) => ((sbyte)v))));
+            nullableInt8.SetComparer(new NullableValueComparer<sbyte>(nullableInt8.TypeMapping.Comparer));
+            nullableInt8.SetKeyComparer(new NullableValueComparer<sbyte>(nullableInt8.TypeMapping.KeyComparer));
+
+            var nullableInt8Array = runtimeEntityType.AddProperty(
+                "NullableInt8Array",
+                typeof(sbyte?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt8Array.SetGetter(
+                sbyte? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableInt8Array(instance) == null);
+            nullableInt8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt8Array(instance) = value;
+                    return instance;
+                });
+            nullableInt8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, sbyte? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableInt8Array(instance) = value;
+                    return instance;
+                });
+            nullableInt8Array.SetAccessors(
+                sbyte? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                sbyte? [] (IInternalEntry entry) => entry.ReadOriginalValue<sbyte? []>(nullableInt8Array, 181),
+                sbyte? [] (IInternalEntry entry) => entry.GetCurrentValue<sbyte? []>(nullableInt8Array));
+            nullableInt8Array.SetPropertyIndexes(
+                index: 181,
+                originalValueIndex: 181,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableInt8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<sbyte?[], sbyte>(new NullableValueComparer<sbyte>(new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<sbyte?[], sbyte>(new NullableValueComparer<sbyte>(new ValueComparer<sbyte>(
+                    bool (sbyte v1, sbyte v2) => v1 == v2,
+                    int (sbyte v) => ((int)v),
+                    sbyte (sbyte v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<sbyte?>(new JsonCollectionOfNullableStructsReaderWriter<sbyte?[], sbyte>(
+                    new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<sbyte?[], sbyte>(
+                    new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v)))),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<sbyte>(
+                        bool (sbyte v1, sbyte v2) => v1 == v2,
+                        int (sbyte v) => ((int)v),
+                        sbyte (sbyte v) => v),
+                    keyComparer: new ValueComparer<sbyte>(
+                        bool (sbyte v1, sbyte v2) => v1 == v2,
+                        int (sbyte v) => ((int)v),
+                        sbyte (sbyte v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    converter: new ValueConverter<sbyte, short>(
+                        short (sbyte v) => ((short)v),
+                        sbyte (short v) => ((sbyte)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<sbyte, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<sbyte, short>(
+                            short (sbyte v) => ((short)v),
+                            sbyte (short v) => ((sbyte)v)))));
+            var nullableInt8ArrayElementType = nullableInt8Array.SetElementType(typeof(sbyte?),
+                nullable: true);
+            nullableInt8ArrayElementType.TypeMapping = nullableInt8Array.TypeMapping.ElementTypeMapping;
+            nullableInt8ArrayElementType.SetComparer(new NullableValueComparer<sbyte>(nullableInt8ArrayElementType.TypeMapping.Comparer));
+
+            var nullablePhysicalAddress = runtimeEntityType.AddProperty(
+                "NullablePhysicalAddress",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullablePhysicalAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullablePhysicalAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullablePhysicalAddress.SetGetter(
+                PhysicalAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullablePhysicalAddress(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullablePhysicalAddress(instance) == null);
+            nullablePhysicalAddress.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullablePhysicalAddress(instance) = value;
+                    return instance;
+                });
+            nullablePhysicalAddress.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullablePhysicalAddress(instance) = value;
+                    return instance;
+                });
+            nullablePhysicalAddress.SetAccessors(
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullablePhysicalAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullablePhysicalAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress>(nullablePhysicalAddress, 182),
+                PhysicalAddress (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress>(nullablePhysicalAddress));
+            nullablePhysicalAddress.SetPropertyIndexes(
+                index: 182,
+                originalValueIndex: 182,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullablePhysicalAddress.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(20)",
+                    size: 20),
+                converter: new ValueConverter<PhysicalAddress, string>(
+                    string (PhysicalAddress v) => ((object)v).ToString(),
+                    PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v))));
+
+            var nullablePhysicalAddressArray = runtimeEntityType.AddProperty(
+                "NullablePhysicalAddressArray",
+                typeof(PhysicalAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullablePhysicalAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullablePhysicalAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullablePhysicalAddressArray.SetGetter(
+                PhysicalAddress[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(instance) == null);
+            nullablePhysicalAddressArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(instance) = value;
+                    return instance;
+                });
+            nullablePhysicalAddressArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(instance) = value;
+                    return instance;
+                });
+            nullablePhysicalAddressArray.SetAccessors(
+                PhysicalAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullablePhysicalAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress[]>(nullablePhysicalAddressArray, 183),
+                PhysicalAddress[] (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress[]>(nullablePhysicalAddressArray));
+            nullablePhysicalAddressArray.SetPropertyIndexes(
+                index: 183,
+                originalValueIndex: 183,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullablePhysicalAddressArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<PhysicalAddress[], PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<PhysicalAddress[], PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<PhysicalAddress>(new JsonCollectionOfReferencesReaderWriter<PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<PhysicalAddress>(
+                        bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                        PhysicalAddress (PhysicalAddress v) => v),
+                    keyComparer: new ValueComparer<PhysicalAddress>(
+                        bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                        PhysicalAddress (PhysicalAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(20)",
+                        size: 20),
+                    converter: new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v)))));
+            var nullablePhysicalAddressArrayElementType = nullablePhysicalAddressArray.SetElementType(typeof(PhysicalAddress),
+                nullable: true);
+            nullablePhysicalAddressArrayElementType.TypeMapping = nullablePhysicalAddressArray.TypeMapping.ElementTypeMapping;
+
+            var nullableString = runtimeEntityType.AddProperty(
+                "NullableString",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableString.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableString(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableString(instance) == null);
+            nullableString.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableString(instance) = value;
+                    return instance;
+                });
+            nullableString.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableString(instance) = value;
+                    return instance;
+                });
+            nullableString.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableString(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(nullableString, 184),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(nullableString));
+            nullableString.SetPropertyIndexes(
+                index: 184,
+                originalValueIndex: 184,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableString.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var nullableStringArray = runtimeEntityType.AddProperty(
+                "NullableStringArray",
+                typeof(string[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableStringArray.SetGetter(
+                string[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableStringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableStringArray(instance) == null);
+            nullableStringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableStringArray(instance) = value;
+                    return instance;
+                });
+            nullableStringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableStringArray(instance) = value;
+                    return instance;
+                });
+            nullableStringArray.SetAccessors(
+                string[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableStringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string[] (IInternalEntry entry) => entry.ReadOriginalValue<string[]>(nullableStringArray, 185),
+                string[] (IInternalEntry entry) => entry.GetCurrentValue<string[]>(nullableStringArray));
+            nullableStringArray.SetPropertyIndexes(
+                index: 185,
+                originalValueIndex: 185,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableStringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<string[], string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<string[], string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var nullableStringArrayElementType = nullableStringArray.SetElementType(typeof(string),
+                nullable: true);
+            nullableStringArrayElementType.TypeMapping = nullableStringArray.TypeMapping.ElementTypeMapping;
+
+            var nullableTimeOnly = runtimeEntityType.AddProperty(
+                "NullableTimeOnly",
+                typeof(TimeOnly?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableTimeOnly.SetGetter(
+                TimeOnly? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeOnly(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableTimeOnly(instance).HasValue));
+            nullableTimeOnly.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeOnly(instance) = value;
+                    return instance;
+                });
+            nullableTimeOnly.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeOnly(instance) = value;
+                    return instance;
+                });
+            nullableTimeOnly.SetAccessors(
+                TimeOnly? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly? (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly?>(nullableTimeOnly, 186),
+                TimeOnly? (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly?>(nullableTimeOnly));
+            nullableTimeOnly.SetPropertyIndexes(
+                index: 186,
+                originalValueIndex: 186,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableTimeOnly.TypeMapping = JetTimeOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v));
+            nullableTimeOnly.SetComparer(new NullableValueComparer<TimeOnly>(nullableTimeOnly.TypeMapping.Comparer));
+            nullableTimeOnly.SetKeyComparer(new NullableValueComparer<TimeOnly>(nullableTimeOnly.TypeMapping.KeyComparer));
+
+            var nullableTimeOnlyArray = runtimeEntityType.AddProperty(
+                "NullableTimeOnlyArray",
+                typeof(TimeOnly?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableTimeOnlyArray.SetGetter(
+                TimeOnly? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeOnlyArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeOnlyArray(instance) == null);
+            nullableTimeOnlyArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeOnlyArray(instance) = value;
+                    return instance;
+                });
+            nullableTimeOnlyArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeOnlyArray(instance) = value;
+                    return instance;
+                });
+            nullableTimeOnlyArray.SetAccessors(
+                TimeOnly? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly? [] (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly? []>(nullableTimeOnlyArray, 187),
+                TimeOnly? [] (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly? []>(nullableTimeOnlyArray));
+            nullableTimeOnlyArray.SetPropertyIndexes(
+                index: 187,
+                originalValueIndex: 187,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableTimeOnlyArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<TimeOnly?[], TimeOnly>(new NullableValueComparer<TimeOnly>(new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<TimeOnly?[], TimeOnly>(new NullableValueComparer<TimeOnly>(new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<TimeOnly?>(new JsonCollectionOfNullableStructsReaderWriter<TimeOnly?[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<TimeOnly?[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance),
+                elementMapping: JetTimeOnlyTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v),
+                    keyComparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v),
+                    providerValueComparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v)));
+            var nullableTimeOnlyArrayElementType = nullableTimeOnlyArray.SetElementType(typeof(TimeOnly?),
+                nullable: true);
+            nullableTimeOnlyArrayElementType.TypeMapping = nullableTimeOnlyArray.TypeMapping.ElementTypeMapping;
+            nullableTimeOnlyArrayElementType.SetComparer(new NullableValueComparer<TimeOnly>(nullableTimeOnlyArrayElementType.TypeMapping.Comparer));
+
+            var nullableTimeSpan = runtimeEntityType.AddProperty(
+                "NullableTimeSpan",
+                typeof(TimeSpan?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeSpan", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeSpan>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableTimeSpan.SetGetter(
+                TimeSpan? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeSpan(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableTimeSpan(instance).HasValue));
+            nullableTimeSpan.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeSpan(instance) = value;
+                    return instance;
+                });
+            nullableTimeSpan.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeSpan(instance) = value;
+                    return instance;
+                });
+            nullableTimeSpan.SetAccessors(
+                TimeSpan? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeSpan(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeSpan(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan? (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan?>(nullableTimeSpan, 188),
+                TimeSpan? (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan?>(nullableTimeSpan));
+            nullableTimeSpan.SetPropertyIndexes(
+                index: 188,
+                originalValueIndex: 188,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableTimeSpan.TypeMapping = JetTimeSpanTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v));
+            nullableTimeSpan.SetComparer(new NullableValueComparer<TimeSpan>(nullableTimeSpan.TypeMapping.Comparer));
+            nullableTimeSpan.SetKeyComparer(new NullableValueComparer<TimeSpan>(nullableTimeSpan.TypeMapping.KeyComparer));
+
+            var nullableTimeSpanArray = runtimeEntityType.AddProperty(
+                "NullableTimeSpanArray",
+                typeof(TimeSpan?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeSpanArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeSpanArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableTimeSpanArray.SetGetter(
+                TimeSpan? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeSpanArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableTimeSpanArray(instance) == null);
+            nullableTimeSpanArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeSpanArray(instance) = value;
+                    return instance;
+                });
+            nullableTimeSpanArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableTimeSpanArray(instance) = value;
+                    return instance;
+                });
+            nullableTimeSpanArray.SetAccessors(
+                TimeSpan? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeSpanArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableTimeSpanArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan? [] (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan? []>(nullableTimeSpanArray, 189),
+                TimeSpan? [] (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan? []>(nullableTimeSpanArray));
+            nullableTimeSpanArray.SetPropertyIndexes(
+                index: 189,
+                originalValueIndex: 189,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableTimeSpanArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<TimeSpan?[], TimeSpan>(new NullableValueComparer<TimeSpan>(new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<TimeSpan?[], TimeSpan>(new NullableValueComparer<TimeSpan>(new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<TimeSpan?>(new JsonCollectionOfNullableStructsReaderWriter<TimeSpan?[], TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<TimeSpan?[], TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance),
+                elementMapping: JetTimeSpanTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v),
+                    keyComparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v),
+                    providerValueComparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v)));
+            var nullableTimeSpanArrayElementType = nullableTimeSpanArray.SetElementType(typeof(TimeSpan?),
+                nullable: true);
+            nullableTimeSpanArrayElementType.TypeMapping = nullableTimeSpanArray.TypeMapping.ElementTypeMapping;
+            nullableTimeSpanArrayElementType.SetComparer(new NullableValueComparer<TimeSpan>(nullableTimeSpanArrayElementType.TypeMapping.Comparer));
+
+            var nullableUInt16 = runtimeEntityType.AddProperty(
+                "NullableUInt16",
+                typeof(ushort?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt16.SetGetter(
+                ushort? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableUInt16(instance).HasValue));
+            nullableUInt16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt16(instance) = value;
+                    return instance;
+                });
+            nullableUInt16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt16(instance) = value;
+                    return instance;
+                });
+            nullableUInt16.SetAccessors(
+                ushort? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort? (IInternalEntry entry) => entry.ReadOriginalValue<ushort?>(nullableUInt16, 190),
+                ushort? (IInternalEntry entry) => entry.GetCurrentValue<ushort?>(nullableUInt16));
+            nullableUInt16.SetPropertyIndexes(
+                index: 190,
+                originalValueIndex: 190,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt16.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v),
+                keyComparer: new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<ushort, int>(
+                    int (ushort v) => ((int)v),
+                    ushort (int v) => ((ushort)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ushort, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<ushort, int>(
+                        int (ushort v) => ((int)v),
+                        ushort (int v) => ((ushort)v))));
+            nullableUInt16.SetComparer(new NullableValueComparer<ushort>(nullableUInt16.TypeMapping.Comparer));
+            nullableUInt16.SetKeyComparer(new NullableValueComparer<ushort>(nullableUInt16.TypeMapping.KeyComparer));
+
+            var nullableUInt16Array = runtimeEntityType.AddProperty(
+                "NullableUInt16Array",
+                typeof(ushort?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt16Array.SetGetter(
+                ushort? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt16Array(instance) == null);
+            nullableUInt16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt16Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt16Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt16Array.SetAccessors(
+                ushort? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort? [] (IInternalEntry entry) => entry.ReadOriginalValue<ushort? []>(nullableUInt16Array, 191),
+                ushort? [] (IInternalEntry entry) => entry.GetCurrentValue<ushort? []>(nullableUInt16Array));
+            nullableUInt16Array.SetPropertyIndexes(
+                index: 191,
+                originalValueIndex: 191,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<ushort?[], ushort>(new NullableValueComparer<ushort>(new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<ushort?[], ushort>(new NullableValueComparer<ushort>(new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<ushort?>(new JsonCollectionOfNullableStructsReaderWriter<ushort?[], ushort>(
+                    new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<ushort?[], ushort>(
+                    new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ushort>(
+                        bool (ushort v1, ushort v2) => v1 == v2,
+                        int (ushort v) => ((int)v),
+                        ushort (ushort v) => v),
+                    keyComparer: new ValueComparer<ushort>(
+                        bool (ushort v1, ushort v2) => v1 == v2,
+                        int (ushort v) => ((int)v),
+                        ushort (ushort v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<ushort, int>(
+                        int (ushort v) => ((int)v),
+                        ushort (int v) => ((ushort)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v)))));
+            var nullableUInt16ArrayElementType = nullableUInt16Array.SetElementType(typeof(ushort?),
+                nullable: true);
+            nullableUInt16ArrayElementType.TypeMapping = nullableUInt16Array.TypeMapping.ElementTypeMapping;
+            nullableUInt16ArrayElementType.SetComparer(new NullableValueComparer<ushort>(nullableUInt16ArrayElementType.TypeMapping.Comparer));
+
+            var nullableUInt32 = runtimeEntityType.AddProperty(
+                "NullableUInt32",
+                typeof(uint?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt32.SetGetter(
+                uint? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableUInt32(instance).HasValue));
+            nullableUInt32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt32(instance) = value;
+                    return instance;
+                });
+            nullableUInt32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt32(instance) = value;
+                    return instance;
+                });
+            nullableUInt32.SetAccessors(
+                uint? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint? (IInternalEntry entry) => entry.ReadOriginalValue<uint?>(nullableUInt32, 192),
+                uint? (IInternalEntry entry) => entry.GetCurrentValue<uint?>(nullableUInt32));
+            nullableUInt32.SetPropertyIndexes(
+                index: 192,
+                originalValueIndex: 192,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt32.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v),
+                keyComparer: new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<uint, long>(
+                    long (uint v) => ((long)v),
+                    uint (long v) => ((uint)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<uint, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<uint, long>(
+                        long (uint v) => ((long)v),
+                        uint (long v) => ((uint)v))));
+            nullableUInt32.SetComparer(new NullableValueComparer<uint>(nullableUInt32.TypeMapping.Comparer));
+            nullableUInt32.SetKeyComparer(new NullableValueComparer<uint>(nullableUInt32.TypeMapping.KeyComparer));
+
+            var nullableUInt32Array = runtimeEntityType.AddProperty(
+                "NullableUInt32Array",
+                typeof(uint?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt32Array.SetGetter(
+                uint? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt32Array(instance) == null);
+            nullableUInt32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt32Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt32Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt32Array.SetAccessors(
+                uint? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint? [] (IInternalEntry entry) => entry.ReadOriginalValue<uint? []>(nullableUInt32Array, 193),
+                uint? [] (IInternalEntry entry) => entry.GetCurrentValue<uint? []>(nullableUInt32Array));
+            nullableUInt32Array.SetPropertyIndexes(
+                index: 193,
+                originalValueIndex: 193,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<uint?[], uint>(new NullableValueComparer<uint>(new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<uint?[], uint>(new NullableValueComparer<uint>(new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<uint?>(new JsonCollectionOfNullableStructsReaderWriter<uint?[], uint>(
+                    new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<uint?[], uint>(
+                    new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<uint>(
+                        bool (uint v1, uint v2) => v1 == v2,
+                        int (uint v) => ((int)v),
+                        uint (uint v) => v),
+                    keyComparer: new ValueComparer<uint>(
+                        bool (uint v1, uint v2) => v1 == v2,
+                        int (uint v) => ((int)v),
+                        uint (uint v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<uint, long>(
+                        long (uint v) => ((long)v),
+                        uint (long v) => ((uint)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v)))));
+            var nullableUInt32ArrayElementType = nullableUInt32Array.SetElementType(typeof(uint?),
+                nullable: true);
+            nullableUInt32ArrayElementType.TypeMapping = nullableUInt32Array.TypeMapping.ElementTypeMapping;
+            nullableUInt32ArrayElementType.SetComparer(new NullableValueComparer<uint>(nullableUInt32ArrayElementType.TypeMapping.Comparer));
+
+            var nullableUInt64 = runtimeEntityType.AddProperty(
+                "NullableUInt64",
+                typeof(ulong?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt64.SetGetter(
+                ulong? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableUInt64(instance).HasValue));
+            nullableUInt64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt64(instance) = value;
+                    return instance;
+                });
+            nullableUInt64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt64(instance) = value;
+                    return instance;
+                });
+            nullableUInt64.SetAccessors(
+                ulong? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong? (IInternalEntry entry) => entry.ReadOriginalValue<ulong?>(nullableUInt64, 194),
+                ulong? (IInternalEntry entry) => entry.GetCurrentValue<ulong?>(nullableUInt64));
+            nullableUInt64.SetPropertyIndexes(
+                index: 194,
+                originalValueIndex: 194,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt64.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v),
+                keyComparer: new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<ulong, decimal>(
+                    decimal (ulong v) => ((decimal)v),
+                    ulong (decimal v) => ((ulong)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ulong, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<ulong, decimal>(
+                        decimal (ulong v) => ((decimal)v),
+                        ulong (decimal v) => ((ulong)v))));
+            nullableUInt64.SetComparer(new NullableValueComparer<ulong>(nullableUInt64.TypeMapping.Comparer));
+            nullableUInt64.SetKeyComparer(new NullableValueComparer<ulong>(nullableUInt64.TypeMapping.KeyComparer));
+
+            var nullableUInt64Array = runtimeEntityType.AddProperty(
+                "NullableUInt64Array",
+                typeof(ulong?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt64Array.SetGetter(
+                ulong? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt64Array(instance) == null);
+            nullableUInt64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt64Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt64Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt64Array.SetAccessors(
+                ulong? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong? [] (IInternalEntry entry) => entry.ReadOriginalValue<ulong? []>(nullableUInt64Array, 195),
+                ulong? [] (IInternalEntry entry) => entry.GetCurrentValue<ulong? []>(nullableUInt64Array));
+            nullableUInt64Array.SetPropertyIndexes(
+                index: 195,
+                originalValueIndex: 195,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<ulong?[], ulong>(new NullableValueComparer<ulong>(new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<ulong?[], ulong>(new NullableValueComparer<ulong>(new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<ulong?>(new JsonCollectionOfNullableStructsReaderWriter<ulong?[], ulong>(
+                    new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<ulong?[], ulong>(
+                    new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v)))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ulong>(
+                        bool (ulong v1, ulong v2) => v1 == v2,
+                        int (ulong v) => ((object)v).GetHashCode(),
+                        ulong (ulong v) => v),
+                    keyComparer: new ValueComparer<ulong>(
+                        bool (ulong v1, ulong v2) => v1 == v2,
+                        int (ulong v) => ((object)v).GetHashCode(),
+                        ulong (ulong v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<ulong, decimal>(
+                        decimal (ulong v) => ((decimal)v),
+                        ulong (decimal v) => ((ulong)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v)))));
+            var nullableUInt64ArrayElementType = nullableUInt64Array.SetElementType(typeof(ulong?),
+                nullable: true);
+            nullableUInt64ArrayElementType.TypeMapping = nullableUInt64Array.TypeMapping.ElementTypeMapping;
+            nullableUInt64ArrayElementType.SetComparer(new NullableValueComparer<ulong>(nullableUInt64ArrayElementType.TypeMapping.Comparer));
+
+            var nullableUInt8 = runtimeEntityType.AddProperty(
+                "NullableUInt8",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt8.SetGetter(
+                byte? (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => !(ManyTypesUnsafeAccessors.NullableUInt8(instance).HasValue));
+            nullableUInt8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt8(instance) = value;
+                    return instance;
+                });
+            nullableUInt8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte? value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt8(instance) = value;
+                    return instance;
+                });
+            nullableUInt8.SetAccessors(
+                byte? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte? (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte? (IInternalEntry entry) => entry.ReadOriginalValue<byte?>(nullableUInt8, 196),
+                byte? (IInternalEntry entry) => entry.GetCurrentValue<byte?>(nullableUInt8));
+            nullableUInt8.SetPropertyIndexes(
+                index: 196,
+                originalValueIndex: 196,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt8.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                keyComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v));
+            nullableUInt8.SetComparer(new NullableValueComparer<byte>(nullableUInt8.TypeMapping.Comparer));
+            nullableUInt8.SetKeyComparer(new NullableValueComparer<byte>(nullableUInt8.TypeMapping.KeyComparer));
+
+            var nullableUInt8Array = runtimeEntityType.AddProperty(
+                "NullableUInt8Array",
+                typeof(byte?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt8Array.SetGetter(
+                byte? [] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUInt8Array(instance) == null);
+            nullableUInt8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt8Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte? [] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUInt8Array(instance) = value;
+                    return instance;
+                });
+            nullableUInt8Array.SetAccessors(
+                byte? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte? [] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte? [] (IInternalEntry entry) => entry.ReadOriginalValue<byte? []>(nullableUInt8Array, 197),
+                byte? [] (IInternalEntry entry) => entry.GetCurrentValue<byte? []>(nullableUInt8Array));
+            nullableUInt8Array.SetPropertyIndexes(
+                index: 197,
+                originalValueIndex: 197,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUInt8Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfNullableValueTypesComparer<byte?[], byte>(new NullableValueComparer<byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v))),
+                keyComparer: new ListOfNullableValueTypesComparer<byte?[], byte>(new NullableValueComparer<byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v))),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte?>(new JsonCollectionOfNullableStructsReaderWriter<byte?[], byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfNullableStructsReaderWriter<byte?[], byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var nullableUInt8ArrayElementType = nullableUInt8Array.SetElementType(typeof(byte?),
+                nullable: true);
+            nullableUInt8ArrayElementType.TypeMapping = nullableUInt8Array.TypeMapping.ElementTypeMapping;
+            nullableUInt8ArrayElementType.SetComparer(new NullableValueComparer<byte>(nullableUInt8ArrayElementType.TypeMapping.Comparer));
+
+            var nullableUri = runtimeEntityType.AddProperty(
+                "NullableUri",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUri", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUri>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUri.SetGetter(
+                Uri (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUri(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUri(instance) == null);
+            nullableUri.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUri(instance) = value;
+                    return instance;
+                });
+            nullableUri.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUri(instance) = value;
+                    return instance;
+                });
+            nullableUri.SetAccessors(
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUri(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUri(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => entry.ReadOriginalValue<Uri>(nullableUri, 198),
+                Uri (IInternalEntry entry) => entry.GetCurrentValue<Uri>(nullableUri));
+            nullableUri.SetPropertyIndexes(
+                index: 198,
+                originalValueIndex: 198,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUri.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                keyComparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<Uri, string>(
+                    string (Uri v) => ((object)v).ToString(),
+                    Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))));
+
+            var nullableUriArray = runtimeEntityType.AddProperty(
+                "NullableUriArray",
+                typeof(Uri[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUriArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUriArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUriArray.SetGetter(
+                Uri[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUriArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.NullableUriArray(instance) == null);
+            nullableUriArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUriArray(instance) = value;
+                    return instance;
+                });
+            nullableUriArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.NullableUriArray(instance) = value;
+                    return instance;
+                });
+            nullableUriArray.SetAccessors(
+                Uri[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUriArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.NullableUriArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri[] (IInternalEntry entry) => entry.ReadOriginalValue<Uri[]>(nullableUriArray, 199),
+                Uri[] (IInternalEntry entry) => entry.GetCurrentValue<Uri[]>(nullableUriArray));
+            nullableUriArray.SetPropertyIndexes(
+                index: 199,
+                originalValueIndex: 199,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            nullableUriArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<Uri[], Uri>(new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<Uri[], Uri>(new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<Uri>(new JsonCollectionOfReferencesReaderWriter<Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Uri>(
+                        bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (Uri v) => ((object)v).GetHashCode(),
+                        Uri (Uri v) => v),
+                    keyComparer: new ValueComparer<Uri>(
+                        bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (Uri v) => ((object)v).GetHashCode(),
+                        Uri (Uri v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))));
+            var nullableUriArrayElementType = nullableUriArray.SetElementType(typeof(Uri),
+                nullable: true);
+            nullableUriArrayElementType.TypeMapping = nullableUriArray.TypeMapping.ElementTypeMapping;
+
+            var physicalAddress = runtimeEntityType.AddProperty(
+                "PhysicalAddress",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            physicalAddress.SetGetter(
+                PhysicalAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddress(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddress(instance) == null);
+            physicalAddress.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddress(instance) = value;
+                    return instance;
+                });
+            physicalAddress.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddress(instance) = value;
+                    return instance;
+                });
+            physicalAddress.SetAccessors(
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddress(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress>(physicalAddress, 200),
+                PhysicalAddress (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress>(physicalAddress));
+            physicalAddress.SetPropertyIndexes(
+                index: 200,
+                originalValueIndex: 200,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            physicalAddress.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(20)",
+                    size: 20),
+                converter: new ValueConverter<PhysicalAddress, string>(
+                    string (PhysicalAddress v) => ((object)v).ToString(),
+                    PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v))));
+
+            var physicalAddressArray = runtimeEntityType.AddProperty(
+                "PhysicalAddressArray",
+                typeof(PhysicalAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            physicalAddressArray.SetGetter(
+                PhysicalAddress[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressArray(instance) == null);
+            physicalAddressArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressArray(instance) = value;
+                    return instance;
+                });
+            physicalAddressArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressArray(instance) = value;
+                    return instance;
+                });
+            physicalAddressArray.SetAccessors(
+                PhysicalAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress[]>(physicalAddressArray, 201),
+                PhysicalAddress[] (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress[]>(physicalAddressArray));
+            physicalAddressArray.SetPropertyIndexes(
+                index: 201,
+                originalValueIndex: 201,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            physicalAddressArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<PhysicalAddress[], PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<PhysicalAddress[], PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<PhysicalAddress>(new JsonCollectionOfReferencesReaderWriter<PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<PhysicalAddress>(
+                        bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                        PhysicalAddress (PhysicalAddress v) => v),
+                    keyComparer: new ValueComparer<PhysicalAddress>(
+                        bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                        PhysicalAddress (PhysicalAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(20)",
+                        size: 20),
+                    converter: new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            string (PhysicalAddress v) => ((object)v).ToString(),
+                            PhysicalAddress (string v) => PhysicalAddress.Parse(v)))));
+            var physicalAddressArrayElementType = physicalAddressArray.SetElementType(typeof(PhysicalAddress));
+            physicalAddressArrayElementType.TypeMapping = physicalAddressArray.TypeMapping.ElementTypeMapping;
+
+            var physicalAddressToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "PhysicalAddressToBytesConverterProperty",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new PhysicalAddressToBytesConverter());
+            physicalAddressToBytesConverterProperty.SetGetter(
+                PhysicalAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(instance) == null);
+            physicalAddressToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            physicalAddressToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            physicalAddressToBytesConverterProperty.SetAccessors(
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress>(physicalAddressToBytesConverterProperty, 202),
+                PhysicalAddress (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress>(physicalAddressToBytesConverterProperty));
+            physicalAddressToBytesConverterProperty.SetPropertyIndexes(
+                index: 202,
+                originalValueIndex: 202,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            physicalAddressToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(8)",
+                    size: 8),
+                converter: new ValueConverter<PhysicalAddress, byte[]>(
+                    byte[] (PhysicalAddress v) => v.GetAddressBytes(),
+                    PhysicalAddress (byte[] v) => new PhysicalAddress(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, byte[]>(
+                        byte[] (PhysicalAddress v) => v.GetAddressBytes(),
+                        PhysicalAddress (byte[] v) => new PhysicalAddress(v))));
+
+            var physicalAddressToStringConverterProperty = runtimeEntityType.AddProperty(
+                "PhysicalAddressToStringConverterProperty",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new PhysicalAddressToStringConverter());
+            physicalAddressToStringConverterProperty.SetGetter(
+                PhysicalAddress (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(instance) == null);
+            physicalAddressToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            physicalAddressToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, PhysicalAddress value) =>
+                {
+                    ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            physicalAddressToStringConverterProperty.SetAccessors(
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => ManyTypesUnsafeAccessors.PhysicalAddressToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                PhysicalAddress (IInternalEntry entry) => entry.ReadOriginalValue<PhysicalAddress>(physicalAddressToStringConverterProperty, 203),
+                PhysicalAddress (IInternalEntry entry) => entry.GetCurrentValue<PhysicalAddress>(physicalAddressToStringConverterProperty));
+            physicalAddressToStringConverterProperty.SetPropertyIndexes(
+                index: 203,
+                originalValueIndex: 203,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            physicalAddressToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    bool (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    int (PhysicalAddress v) => ((object)v).GetHashCode(),
+                    PhysicalAddress (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(20)",
+                    size: 20),
+                converter: new ValueConverter<PhysicalAddress, string>(
+                    string (PhysicalAddress v) => ((object)v).ToString(),
+                    PhysicalAddress (string v) => PhysicalAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, string>(
+                        string (PhysicalAddress v) => ((object)v).ToString(),
+                        PhysicalAddress (string v) => PhysicalAddress.Parse(v))));
+
+            var @string = runtimeEntityType.AddProperty(
+                "String",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("String", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<String>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            @string.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.String(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.String(instance) == null);
+            @string.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.String(instance) = value;
+                    return instance;
+                });
+            @string.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.String(instance) = value;
+                    return instance;
+                });
+            @string.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.String(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.String(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(@string, 204),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(@string));
+            @string.SetPropertyIndexes(
+                index: 204,
+                originalValueIndex: 204,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            @string.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var stringArray = runtimeEntityType.AddProperty(
+                "StringArray",
+                typeof(string[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            stringArray.SetGetter(
+                string[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringArray(instance) == null);
+            stringArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringArray(instance) = value;
+                    return instance;
+                });
+            stringArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringArray(instance) = value;
+                    return instance;
+                });
+            stringArray.SetAccessors(
+                string[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string[] (IInternalEntry entry) => entry.ReadOriginalValue<string[]>(stringArray, 205),
+                string[] (IInternalEntry entry) => entry.GetCurrentValue<string[]>(stringArray));
+            stringArray.SetPropertyIndexes(
+                index: 205,
+                originalValueIndex: 205,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<string[], string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<string[], string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var stringArrayElementType = stringArray.SetElementType(typeof(string));
+            stringArrayElementType.TypeMapping = stringArray.TypeMapping.ElementTypeMapping;
+
+            var stringReadOnlyCollection = runtimeEntityType.AddProperty(
+                "StringReadOnlyCollection",
+                typeof(IReadOnlyCollection<string>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_stringReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            stringReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<string> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<string>)(ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance) == null);
+            stringReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<string> value) =>
+                {
+                    ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance) = ((List<string>)value);
+                    return instance;
+                });
+            stringReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<string> value) =>
+                {
+                    ManyTypesUnsafeAccessors._stringReadOnlyCollection(instance) = ((List<string>)value);
+                    return instance;
+                });
+            stringReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<string> (IInternalEntry entry) => ((IReadOnlyCollection<string>)(ManyTypesUnsafeAccessors._stringReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<string> (IInternalEntry entry) => ((IReadOnlyCollection<string>)(ManyTypesUnsafeAccessors._stringReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<string> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<string>>(stringReadOnlyCollection, 206),
+                IReadOnlyCollection<string> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<string>>(stringReadOnlyCollection));
+            stringReadOnlyCollection.SetPropertyIndexes(
+                index: 206,
+                originalValueIndex: 206,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var stringReadOnlyCollectionElementType = stringReadOnlyCollection.SetElementType(typeof(string));
+            stringReadOnlyCollectionElementType.TypeMapping = stringReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var stringToBoolConverterProperty = runtimeEntityType.AddProperty(
+                "StringToBoolConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToBoolConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToBoolConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToBoolConverter());
+            stringToBoolConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToBoolConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToBoolConverterProperty(instance) == null);
+            stringToBoolConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToBoolConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToBoolConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToBoolConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToBoolConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToBoolConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToBoolConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToBoolConverterProperty, 207),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToBoolConverterProperty));
+            stringToBoolConverterProperty.SetPropertyIndexes(
+                index: 207,
+                originalValueIndex: 207,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToBoolConverterProperty.TypeMapping = JetBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                converter: new ValueConverter<string, bool>(
+                    bool (string v) => Convert.ToBoolean(v),
+                    string (bool v) => Convert.ToString(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, bool>(
+                    JsonBoolReaderWriter.Instance,
+                    new ValueConverter<string, bool>(
+                        bool (string v) => Convert.ToBoolean(v),
+                        string (bool v) => Convert.ToString(v))));
+
+            var stringToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "StringToBytesConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            stringToBytesConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToBytesConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToBytesConverterProperty(instance) == null);
+            stringToBytesConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToBytesConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToBytesConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToBytesConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToBytesConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToBytesConverterProperty, 208),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToBytesConverterProperty));
+            stringToBytesConverterProperty.SetPropertyIndexes(
+                index: 208,
+                originalValueIndex: 208,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToBytesConverterProperty.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                converter: new ValueConverter<string, byte[]>(
+                    byte[] (string v) => Encoding.GetEncoding(12000).GetBytes(v),
+                    string (byte[] v) => Encoding.GetEncoding(12000).GetString(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<string, byte[]>(
+                        byte[] (string v) => Encoding.GetEncoding(12000).GetBytes(v),
+                        string (byte[] v) => Encoding.GetEncoding(12000).GetString(v))));
+
+            var stringToCharConverterProperty = runtimeEntityType.AddProperty(
+                "StringToCharConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToCharConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToCharConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToCharConverter());
+            stringToCharConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToCharConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToCharConverterProperty(instance) == null);
+            stringToCharConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToCharConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToCharConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToCharConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToCharConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToCharConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToCharConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToCharConverterProperty, 209),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToCharConverterProperty));
+            stringToCharConverterProperty.SetPropertyIndexes(
+                index: 209,
+                originalValueIndex: 209,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToCharConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<string, string>(
+                    string (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)((v.Length < 1 ? '\0' : v[0])))),
+                    string (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)((v.Length < 1 ? '\0' : v[0]))))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        string (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)((v.Length < 1 ? '\0' : v[0])))),
+                        string (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)((v.Length < 1 ? '\0' : v[0])))))));
+
+            var stringToDateOnlyConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateOnlyConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateOnlyConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateOnlyConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateOnlyConverter());
+            stringToDateOnlyConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(instance) == null);
+            stringToDateOnlyConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateOnlyConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateOnlyConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateOnlyConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDateOnlyConverterProperty, 210),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDateOnlyConverterProperty));
+            stringToDateOnlyConverterProperty.SetPropertyIndexes(
+                index: 210,
+                originalValueIndex: 210,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDateOnlyConverterProperty.TypeMapping = JetDateOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<DateOnly>(
+                    bool (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    int (DateOnly v) => ((object)v).GetHashCode(),
+                    DateOnly (DateOnly v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 10),
+                converter: new ValueConverter<string, DateOnly>(
+                    DateOnly (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                    string (DateOnly v) => v.ToString("yyyy\\-MM\\-dd")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance,
+                    new ValueConverter<string, DateOnly>(
+                        DateOnly (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                        string (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"))));
+
+            var stringToDateTimeConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateTimeConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateTimeConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateTimeConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateTimeConverter());
+            stringToDateTimeConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(instance) == null);
+            stringToDateTimeConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateTimeConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateTimeConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateTimeConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDateTimeConverterProperty, 211),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDateTimeConverterProperty));
+            stringToDateTimeConverterProperty.SetPropertyIndexes(
+                index: 211,
+                originalValueIndex: 211,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDateTimeConverterProperty.TypeMapping = JetDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 48),
+                converter: new ValueConverter<string, DateTime>(
+                    DateTime (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture),
+                    string (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, DateTime>(
+                    JsonDateTimeReaderWriter.Instance,
+                    new ValueConverter<string, DateTime>(
+                        DateTime (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture),
+                        string (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"))));
+
+            var stringToDateTimeOffsetConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateTimeOffsetConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateTimeOffsetConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateTimeOffsetConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateTimeOffsetConverter());
+            stringToDateTimeOffsetConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(instance) == null);
+            stringToDateTimeOffsetConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateTimeOffsetConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDateTimeOffsetConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDateTimeOffsetConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDateTimeOffsetConverterProperty, 212),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDateTimeOffsetConverterProperty));
+            stringToDateTimeOffsetConverterProperty.SetPropertyIndexes(
+                index: 212,
+                originalValueIndex: 212,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDateTimeOffsetConverterProperty.TypeMapping = JetDateTimeOffsetTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<DateTimeOffset>(
+                    bool (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    int (DateTimeOffset v) => ((object)v).GetHashCode(),
+                    DateTimeOffset (DateTimeOffset v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 48),
+                converter: new ValueConverter<string, DateTimeOffset>(
+                    DateTimeOffset (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture),
+                    string (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, DateTimeOffset>(
+                    JsonDateTimeOffsetReaderWriter.Instance,
+                    new ValueConverter<string, DateTimeOffset>(
+                        DateTimeOffset (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture),
+                        string (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"))));
+
+            var stringToDecimalNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDecimalNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDecimalNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDecimalNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<decimal>());
+            stringToDecimalNumberConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(instance) == null);
+            stringToDecimalNumberConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDecimalNumberConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDecimalNumberConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDecimalNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDecimalNumberConverterProperty, 213),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDecimalNumberConverterProperty));
+            stringToDecimalNumberConverterProperty.SetPropertyIndexes(
+                index: 213,
+                originalValueIndex: 213,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDecimalNumberConverterProperty.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 64),
+                converter: new ValueConverter<string, decimal>(
+                    decimal (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                    string (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<string, decimal>(
+                        decimal (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                        string (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)))));
+
+            var stringToDoubleNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDoubleNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDoubleNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDoubleNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<double>());
+            stringToDoubleNumberConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(instance) == null);
+            stringToDoubleNumberConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDoubleNumberConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToDoubleNumberConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToDoubleNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToDoubleNumberConverterProperty, 214),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToDoubleNumberConverterProperty));
+            stringToDoubleNumberConverterProperty.SetPropertyIndexes(
+                index: 214,
+                originalValueIndex: 214,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToDoubleNumberConverterProperty.TypeMapping = JetDoubleTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<double>(
+                    bool (double v1, double v2) => v1.Equals(v2),
+                    int (double v) => ((object)v).GetHashCode(),
+                    double (double v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 64),
+                converter: new ValueConverter<string, double>(
+                    double (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                    string (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", ((object)v))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, double>(
+                    JsonDoubleReaderWriter.Instance,
+                    new ValueConverter<string, double>(
+                        double (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                        string (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", ((object)v)))));
+
+            var stringToEnumConverterProperty = runtimeEntityType.AddProperty(
+                "StringToEnumConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToEnumConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToEnumConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToEnumConverter<CompiledModelTestBase.EnumU32>());
+            stringToEnumConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToEnumConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToEnumConverterProperty(instance) == null);
+            stringToEnumConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToEnumConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToEnumConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToEnumConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToEnumConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToEnumConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToEnumConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToEnumConverterProperty, 215),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToEnumConverterProperty));
+            stringToEnumConverterProperty.SetPropertyIndexes(
+                index: 215,
+                originalValueIndex: 215,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToEnumConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<string, long>(
+                    long (string v) => ((long)(StringEnumConverter<string, CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))),
+                    string (long value) => ((object)((CompiledModelTestBase.EnumU32)value)).ToString()),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<string, long>(
+                        long (string v) => ((long)(StringEnumConverter<string, CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))),
+                        string (long value) => ((object)((CompiledModelTestBase.EnumU32)value)).ToString())));
+
+            var stringToGuidConverterProperty = runtimeEntityType.AddProperty(
+                "StringToGuidConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToGuidConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToGuidConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            stringToGuidConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToGuidConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToGuidConverterProperty(instance) == null);
+            stringToGuidConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToGuidConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToGuidConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToGuidConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToGuidConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToGuidConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToGuidConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToGuidConverterProperty, 216),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToGuidConverterProperty));
+            stringToGuidConverterProperty.SetPropertyIndexes(
+                index: 216,
+                originalValueIndex: 216,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToGuidConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var stringToIntNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToIntNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToIntNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToIntNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<int>());
+            stringToIntNumberConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(instance) == null);
+            stringToIntNumberConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToIntNumberConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToIntNumberConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToIntNumberConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToIntNumberConverterProperty, 217),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToIntNumberConverterProperty));
+            stringToIntNumberConverterProperty.SetPropertyIndexes(
+                index: 217,
+                originalValueIndex: 217,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToIntNumberConverterProperty.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 64),
+                converter: new ValueConverter<string, int>(
+                    int (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                    string (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<string, int>(
+                        int (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                        string (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)))));
+
+            var stringToTimeOnlyConverterProperty = runtimeEntityType.AddProperty(
+                "StringToTimeOnlyConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToTimeOnlyConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToTimeOnlyConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToTimeOnlyConverter());
+            stringToTimeOnlyConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(instance) == null);
+            stringToTimeOnlyConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToTimeOnlyConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToTimeOnlyConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToTimeOnlyConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToTimeOnlyConverterProperty, 218),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToTimeOnlyConverterProperty));
+            stringToTimeOnlyConverterProperty.SetPropertyIndexes(
+                index: 218,
+                originalValueIndex: 218,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToTimeOnlyConverterProperty.TypeMapping = JetTimeOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 48),
+                converter: new ValueConverter<string, TimeOnly>(
+                    TimeOnly (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                    string (TimeOnly v) => (v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", ((object)v)) : v.ToString("o"))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance,
+                    new ValueConverter<string, TimeOnly>(
+                        TimeOnly (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                        string (TimeOnly v) => (v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", ((object)v)) : v.ToString("o")))));
+
+            var stringToTimeSpanConverterProperty = runtimeEntityType.AddProperty(
+                "StringToTimeSpanConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToTimeSpanConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToTimeSpanConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToTimeSpanConverter());
+            stringToTimeSpanConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(instance) == null);
+            stringToTimeSpanConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToTimeSpanConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToTimeSpanConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToTimeSpanConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToTimeSpanConverterProperty, 219),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToTimeSpanConverterProperty));
+            stringToTimeSpanConverterProperty.SetPropertyIndexes(
+                index: 219,
+                originalValueIndex: 219,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToTimeSpanConverterProperty.TypeMapping = JetTimeSpanTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 48),
+                converter: new ValueConverter<string, TimeSpan>(
+                    TimeSpan (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture),
+                    string (TimeSpan v) => v.ToString("c")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance,
+                    new ValueConverter<string, TimeSpan>(
+                        TimeSpan (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture),
+                        string (TimeSpan v) => v.ToString("c"))));
+
+            var stringToUriConverterProperty = runtimeEntityType.AddProperty(
+                "StringToUriConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToUriConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToUriConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToUriConverter());
+            stringToUriConverterProperty.SetGetter(
+                string (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToUriConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.StringToUriConverterProperty(instance) == null);
+            stringToUriConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToUriConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToUriConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, string value) =>
+                {
+                    ManyTypesUnsafeAccessors.StringToUriConverterProperty(instance) = value;
+                    return instance;
+                });
+            stringToUriConverterProperty.SetAccessors(
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToUriConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => ManyTypesUnsafeAccessors.StringToUriConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(stringToUriConverterProperty, 220),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(stringToUriConverterProperty));
+            stringToUriConverterProperty.SetPropertyIndexes(
+                index: 220,
+                originalValueIndex: 220,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            stringToUriConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<string, string>(
+                    string (string v) => ((object)new Uri(v, UriKind.RelativeOrAbsolute)).ToString(),
+                    string (string v) => ((object)new Uri(v, UriKind.RelativeOrAbsolute)).ToString()),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        string (string v) => ((object)new Uri(v, UriKind.RelativeOrAbsolute)).ToString(),
+                        string (string v) => ((object)new Uri(v, UriKind.RelativeOrAbsolute)).ToString())));
+
+            var timeOnly = runtimeEntityType.AddProperty(
+                "TimeOnly",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new TimeOnly(0, 0, 0));
+            timeOnly.SetGetter(
+                TimeOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnly(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnly(instance) == default(TimeOnly));
+            timeOnly.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnly(instance) = value;
+                    return instance;
+                });
+            timeOnly.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnly(instance) = value;
+                    return instance;
+                });
+            timeOnly.SetAccessors(
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnly(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly>(timeOnly, 221),
+                TimeOnly (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly>(timeOnly));
+            timeOnly.SetPropertyIndexes(
+                index: 221,
+                originalValueIndex: 221,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeOnly.TypeMapping = JetTimeOnlyTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v));
+
+            var timeOnlyArray = runtimeEntityType.AddProperty(
+                "TimeOnlyArray",
+                typeof(TimeOnly[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            timeOnlyArray.SetGetter(
+                TimeOnly[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyArray(instance) == null);
+            timeOnlyArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyArray(instance) = value;
+                    return instance;
+                });
+            timeOnlyArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyArray(instance) = value;
+                    return instance;
+                });
+            timeOnlyArray.SetAccessors(
+                TimeOnly[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly[] (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly[]>(timeOnlyArray, 222),
+                TimeOnly[] (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly[]>(timeOnlyArray));
+            timeOnlyArray.SetPropertyIndexes(
+                index: 222,
+                originalValueIndex: 222,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeOnlyArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<TimeOnly[], TimeOnly>(new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v)),
+                keyComparer: new ListOfValueTypesComparer<TimeOnly[], TimeOnly>(new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<TimeOnly>(new JsonCollectionOfStructsReaderWriter<TimeOnly[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<TimeOnly[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance),
+                elementMapping: JetTimeOnlyTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v),
+                    keyComparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v),
+                    providerValueComparer: new ValueComparer<TimeOnly>(
+                        bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        int (TimeOnly v) => ((object)v).GetHashCode(),
+                        TimeOnly (TimeOnly v) => v)));
+            var timeOnlyArrayElementType = timeOnlyArray.SetElementType(typeof(TimeOnly));
+            timeOnlyArrayElementType.TypeMapping = timeOnlyArray.TypeMapping.ElementTypeMapping;
+
+            var timeOnlyToStringConverterProperty = runtimeEntityType.AddProperty(
+                "TimeOnlyToStringConverterProperty",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeOnlyToStringConverter());
+            timeOnlyToStringConverterProperty.SetGetter(
+                TimeOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(instance) == default(TimeOnly));
+            timeOnlyToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeOnlyToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeOnlyToStringConverterProperty.SetAccessors(
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly>(timeOnlyToStringConverterProperty, 223),
+                TimeOnly (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly>(timeOnlyToStringConverterProperty));
+            timeOnlyToStringConverterProperty.SetPropertyIndexes(
+                index: 223,
+                originalValueIndex: 223,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeOnlyToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<TimeOnly, string>(
+                    string (TimeOnly v) => (v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", ((object)v)) : v.ToString("o")),
+                    TimeOnly (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeOnly, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<TimeOnly, string>(
+                        string (TimeOnly v) => (v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", ((object)v)) : v.ToString("o")),
+                        TimeOnly (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None))));
+            timeOnlyToStringConverterProperty.SetSentinelFromProviderValue("00:00:00");
+
+            var timeOnlyToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "TimeOnlyToTicksConverterProperty",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeOnlyToTicksConverter());
+            timeOnlyToTicksConverterProperty.SetGetter(
+                TimeOnly (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(instance) == default(TimeOnly));
+            timeOnlyToTicksConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeOnlyToTicksConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeOnly value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeOnlyToTicksConverterProperty.SetAccessors(
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeOnlyToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeOnly (IInternalEntry entry) => entry.ReadOriginalValue<TimeOnly>(timeOnlyToTicksConverterProperty, 224),
+                TimeOnly (IInternalEntry entry) => entry.GetCurrentValue<TimeOnly>(timeOnlyToTicksConverterProperty));
+            timeOnlyToTicksConverterProperty.SetPropertyIndexes(
+                index: 224,
+                originalValueIndex: 224,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeOnlyToTicksConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    bool (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    int (TimeOnly v) => ((object)v).GetHashCode(),
+                    TimeOnly (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<TimeOnly, long>(
+                    long (TimeOnly v) => v.Ticks,
+                    TimeOnly (long v) => new TimeOnly(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeOnly, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<TimeOnly, long>(
+                        long (TimeOnly v) => v.Ticks,
+                        TimeOnly (long v) => new TimeOnly(v))));
+            timeOnlyToTicksConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var timeSpan = runtimeEntityType.AddProperty(
+                "TimeSpan",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpan", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpan>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new TimeSpan(0, 0, 0, 0, 0));
+            timeSpan.SetGetter(
+                TimeSpan (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpan(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpan(instance) == default(TimeSpan));
+            timeSpan.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpan(instance) = value;
+                    return instance;
+                });
+            timeSpan.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpan(instance) = value;
+                    return instance;
+                });
+            timeSpan.SetAccessors(
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpan(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpan(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan>(timeSpan, 225),
+                TimeSpan (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan>(timeSpan));
+            timeSpan.SetPropertyIndexes(
+                index: 225,
+                originalValueIndex: 225,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeSpan.TypeMapping = JetTimeSpanTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v));
+
+            var timeSpanArray = runtimeEntityType.AddProperty(
+                "TimeSpanArray",
+                typeof(TimeSpan[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            timeSpanArray.SetGetter(
+                TimeSpan[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanArray(instance) == null);
+            timeSpanArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanArray(instance) = value;
+                    return instance;
+                });
+            timeSpanArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanArray(instance) = value;
+                    return instance;
+                });
+            timeSpanArray.SetAccessors(
+                TimeSpan[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan[] (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan[]>(timeSpanArray, 226),
+                TimeSpan[] (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan[]>(timeSpanArray));
+            timeSpanArray.SetPropertyIndexes(
+                index: 226,
+                originalValueIndex: 226,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeSpanArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<TimeSpan[], TimeSpan>(new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v)),
+                keyComparer: new ListOfValueTypesComparer<TimeSpan[], TimeSpan>(new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<TimeSpan>(new JsonCollectionOfStructsReaderWriter<TimeSpan[], TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<TimeSpan[], TimeSpan>(
+                    JsonTimeSpanReaderWriter.Instance),
+                elementMapping: JetTimeSpanTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v),
+                    keyComparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v),
+                    providerValueComparer: new ValueComparer<TimeSpan>(
+                        bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        int (TimeSpan v) => ((object)v).GetHashCode(),
+                        TimeSpan (TimeSpan v) => v)));
+            var timeSpanArrayElementType = timeSpanArray.SetElementType(typeof(TimeSpan));
+            timeSpanArrayElementType.TypeMapping = timeSpanArray.TypeMapping.ElementTypeMapping;
+
+            var timeSpanToStringConverterProperty = runtimeEntityType.AddProperty(
+                "TimeSpanToStringConverterProperty",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeSpanToStringConverter());
+            timeSpanToStringConverterProperty.SetGetter(
+                TimeSpan (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(instance) == default(TimeSpan));
+            timeSpanToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeSpanToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeSpanToStringConverterProperty.SetAccessors(
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan>(timeSpanToStringConverterProperty, 227),
+                TimeSpan (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan>(timeSpanToStringConverterProperty));
+            timeSpanToStringConverterProperty.SetPropertyIndexes(
+                index: 227,
+                originalValueIndex: 227,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeSpanToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<TimeSpan, string>(
+                    string (TimeSpan v) => v.ToString("c"),
+                    TimeSpan (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeSpan, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<TimeSpan, string>(
+                        string (TimeSpan v) => v.ToString("c"),
+                        TimeSpan (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture))));
+            timeSpanToStringConverterProperty.SetSentinelFromProviderValue("00:00:00");
+
+            var timeSpanToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "TimeSpanToTicksConverterProperty",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeSpanToTicksConverter());
+            timeSpanToTicksConverterProperty.SetGetter(
+                TimeSpan (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(instance) == default(TimeSpan));
+            timeSpanToTicksConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeSpanToTicksConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, TimeSpan value) =>
+                {
+                    ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(instance) = value;
+                    return instance;
+                });
+            timeSpanToTicksConverterProperty.SetAccessors(
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => ManyTypesUnsafeAccessors.TimeSpanToTicksConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                TimeSpan (IInternalEntry entry) => entry.ReadOriginalValue<TimeSpan>(timeSpanToTicksConverterProperty, 228),
+                TimeSpan (IInternalEntry entry) => entry.GetCurrentValue<TimeSpan>(timeSpanToTicksConverterProperty));
+            timeSpanToTicksConverterProperty.SetPropertyIndexes(
+                index: 228,
+                originalValueIndex: 228,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            timeSpanToTicksConverterProperty.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    bool (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    int (TimeSpan v) => ((object)v).GetHashCode(),
+                    TimeSpan (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<TimeSpan, long>(
+                    long (TimeSpan v) => v.Ticks,
+                    TimeSpan (long v) => new TimeSpan(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeSpan, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<TimeSpan, long>(
+                        long (TimeSpan v) => v.Ticks,
+                        TimeSpan (long v) => new TimeSpan(v))));
+            timeSpanToTicksConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var uInt16 = runtimeEntityType.AddProperty(
+                "UInt16",
+                typeof(ushort),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt16.SetGetter(
+                ushort (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt16(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt16(instance) == 0);
+            uInt16.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt16(instance) = value;
+                    return instance;
+                });
+            uInt16.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt16(instance) = value;
+                    return instance;
+                });
+            uInt16.SetAccessors(
+                ushort (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt16(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort (IInternalEntry entry) => entry.ReadOriginalValue<ushort>(uInt16, 229),
+                ushort (IInternalEntry entry) => entry.GetCurrentValue<ushort>(uInt16));
+            uInt16.SetPropertyIndexes(
+                index: 229,
+                originalValueIndex: 229,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt16.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v),
+                keyComparer: new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<ushort, int>(
+                    int (ushort v) => ((int)v),
+                    ushort (int v) => ((ushort)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ushort, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<ushort, int>(
+                        int (ushort v) => ((int)v),
+                        ushort (int v) => ((ushort)v))));
+            uInt16.SetSentinelFromProviderValue(0);
+
+            var uInt16Array = runtimeEntityType.AddProperty(
+                "UInt16Array",
+                typeof(ushort[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt16Array.SetGetter(
+                ushort[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt16Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt16Array(instance) == null);
+            uInt16Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt16Array(instance) = value;
+                    return instance;
+                });
+            uInt16Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ushort[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt16Array(instance) = value;
+                    return instance;
+                });
+            uInt16Array.SetAccessors(
+                ushort[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt16Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ushort[] (IInternalEntry entry) => entry.ReadOriginalValue<ushort[]>(uInt16Array, 230),
+                ushort[] (IInternalEntry entry) => entry.GetCurrentValue<ushort[]>(uInt16Array));
+            uInt16Array.SetPropertyIndexes(
+                index: 230,
+                originalValueIndex: 230,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt16Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<ushort[], ushort>(new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v)),
+                keyComparer: new ListOfValueTypesComparer<ushort[], ushort>(new ValueComparer<ushort>(
+                    bool (ushort v1, ushort v2) => v1 == v2,
+                    int (ushort v) => ((int)v),
+                    ushort (ushort v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<ushort>(new JsonCollectionOfStructsReaderWriter<ushort[], ushort>(
+                    new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<ushort[], ushort>(
+                    new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v)))),
+                elementMapping: JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ushort>(
+                        bool (ushort v1, ushort v2) => v1 == v2,
+                        int (ushort v) => ((int)v),
+                        ushort (ushort v) => v),
+                    keyComparer: new ValueComparer<ushort>(
+                        bool (ushort v1, ushort v2) => v1 == v2,
+                        int (ushort v) => ((int)v),
+                        ushort (ushort v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    converter: new ValueConverter<ushort, int>(
+                        int (ushort v) => ((int)v),
+                        ushort (int v) => ((ushort)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ushort, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<ushort, int>(
+                            int (ushort v) => ((int)v),
+                            ushort (int v) => ((ushort)v)))));
+            var uInt16ArrayElementType = uInt16Array.SetElementType(typeof(ushort));
+            uInt16ArrayElementType.TypeMapping = uInt16Array.TypeMapping.ElementTypeMapping;
+
+            var uInt32 = runtimeEntityType.AddProperty(
+                "UInt32",
+                typeof(uint),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt32.SetGetter(
+                uint (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt32(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt32(instance) == 0U);
+            uInt32.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt32(instance) = value;
+                    return instance;
+                });
+            uInt32.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt32(instance) = value;
+                    return instance;
+                });
+            uInt32.SetAccessors(
+                uint (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt32(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint (IInternalEntry entry) => entry.ReadOriginalValue<uint>(uInt32, 231),
+                uint (IInternalEntry entry) => entry.GetCurrentValue<uint>(uInt32));
+            uInt32.SetPropertyIndexes(
+                index: 231,
+                originalValueIndex: 231,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt32.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v),
+                keyComparer: new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                converter: new ValueConverter<uint, long>(
+                    long (uint v) => ((long)v),
+                    uint (long v) => ((uint)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<uint, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<uint, long>(
+                        long (uint v) => ((long)v),
+                        uint (long v) => ((uint)v))));
+            uInt32.SetSentinelFromProviderValue(0L);
+
+            var uInt32Array = runtimeEntityType.AddProperty(
+                "UInt32Array",
+                typeof(uint[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt32Array.SetGetter(
+                uint[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt32Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt32Array(instance) == null);
+            uInt32Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt32Array(instance) = value;
+                    return instance;
+                });
+            uInt32Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, uint[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt32Array(instance) = value;
+                    return instance;
+                });
+            uInt32Array.SetAccessors(
+                uint[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt32Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                uint[] (IInternalEntry entry) => entry.ReadOriginalValue<uint[]>(uInt32Array, 232),
+                uint[] (IInternalEntry entry) => entry.GetCurrentValue<uint[]>(uInt32Array));
+            uInt32Array.SetPropertyIndexes(
+                index: 232,
+                originalValueIndex: 232,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt32Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<uint[], uint>(new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v)),
+                keyComparer: new ListOfValueTypesComparer<uint[], uint>(new ValueComparer<uint>(
+                    bool (uint v1, uint v2) => v1 == v2,
+                    int (uint v) => ((int)v),
+                    uint (uint v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<uint>(new JsonCollectionOfStructsReaderWriter<uint[], uint>(
+                    new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<uint[], uint>(
+                    new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v)))),
+                elementMapping: JetLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<uint>(
+                        bool (uint v1, uint v2) => v1 == v2,
+                        int (uint v) => ((int)v),
+                        uint (uint v) => v),
+                    keyComparer: new ValueComparer<uint>(
+                        bool (uint v1, uint v2) => v1 == v2,
+                        int (uint v) => ((int)v),
+                        uint (uint v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        bool (long v1, long v2) => v1 == v2,
+                        int (long v) => ((object)v).GetHashCode(),
+                        long (long v) => v),
+                    converter: new ValueConverter<uint, long>(
+                        long (uint v) => ((long)v),
+                        uint (long v) => ((uint)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<uint, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<uint, long>(
+                            long (uint v) => ((long)v),
+                            uint (long v) => ((uint)v)))));
+            var uInt32ArrayElementType = uInt32Array.SetElementType(typeof(uint));
+            uInt32ArrayElementType.TypeMapping = uInt32Array.TypeMapping.ElementTypeMapping;
+
+            var uInt64 = runtimeEntityType.AddProperty(
+                "UInt64",
+                typeof(ulong),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt64.SetGetter(
+                ulong (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt64(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt64(instance) == 0UL);
+            uInt64.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt64(instance) = value;
+                    return instance;
+                });
+            uInt64.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt64(instance) = value;
+                    return instance;
+                });
+            uInt64.SetAccessors(
+                ulong (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt64(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong (IInternalEntry entry) => entry.ReadOriginalValue<ulong>(uInt64, 233),
+                ulong (IInternalEntry entry) => entry.GetCurrentValue<ulong>(uInt64));
+            uInt64.SetPropertyIndexes(
+                index: 233,
+                originalValueIndex: 233,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt64.TypeMapping = JetDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v),
+                keyComparer: new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    bool (decimal v1, decimal v2) => v1 == v2,
+                    int (decimal v) => ((object)v).GetHashCode(),
+                    decimal (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(20,0)",
+                    precision: 20,
+                    scale: 0),
+                converter: new ValueConverter<ulong, decimal>(
+                    decimal (ulong v) => ((decimal)v),
+                    ulong (decimal v) => ((ulong)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ulong, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<ulong, decimal>(
+                        decimal (ulong v) => ((decimal)v),
+                        ulong (decimal v) => ((ulong)v))));
+            uInt64.SetSentinelFromProviderValue(0m);
+
+            var uInt64Array = runtimeEntityType.AddProperty(
+                "UInt64Array",
+                typeof(ulong[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt64Array.SetGetter(
+                ulong[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt64Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt64Array(instance) == null);
+            uInt64Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt64Array(instance) = value;
+                    return instance;
+                });
+            uInt64Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, ulong[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt64Array(instance) = value;
+                    return instance;
+                });
+            uInt64Array.SetAccessors(
+                ulong[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt64Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                ulong[] (IInternalEntry entry) => entry.ReadOriginalValue<ulong[]>(uInt64Array, 234),
+                ulong[] (IInternalEntry entry) => entry.GetCurrentValue<ulong[]>(uInt64Array));
+            uInt64Array.SetPropertyIndexes(
+                index: 234,
+                originalValueIndex: 234,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt64Array.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<ulong[], ulong>(new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v)),
+                keyComparer: new ListOfValueTypesComparer<ulong[], ulong>(new ValueComparer<ulong>(
+                    bool (ulong v1, ulong v2) => v1 == v2,
+                    int (ulong v) => ((object)v).GetHashCode(),
+                    ulong (ulong v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<ulong>(new JsonCollectionOfStructsReaderWriter<ulong[], ulong>(
+                    new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v))))),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<ulong[], ulong>(
+                    new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v)))),
+                elementMapping: JetDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ulong>(
+                        bool (ulong v1, ulong v2) => v1 == v2,
+                        int (ulong v) => ((object)v).GetHashCode(),
+                        ulong (ulong v) => v),
+                    keyComparer: new ValueComparer<ulong>(
+                        bool (ulong v1, ulong v2) => v1 == v2,
+                        int (ulong v) => ((object)v).GetHashCode(),
+                        ulong (ulong v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        bool (decimal v1, decimal v2) => v1 == v2,
+                        int (decimal v) => ((object)v).GetHashCode(),
+                        decimal (decimal v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "decimal(20,0)",
+                        precision: 20,
+                        scale: 0),
+                    converter: new ValueConverter<ulong, decimal>(
+                        decimal (ulong v) => ((decimal)v),
+                        ulong (decimal v) => ((ulong)v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<ulong, decimal>(
+                        JsonDecimalReaderWriter.Instance,
+                        new ValueConverter<ulong, decimal>(
+                            decimal (ulong v) => ((decimal)v),
+                            ulong (decimal v) => ((ulong)v)))));
+            var uInt64ArrayElementType = uInt64Array.SetElementType(typeof(ulong));
+            uInt64ArrayElementType.TypeMapping = uInt64Array.TypeMapping.ElementTypeMapping;
+
+            var uInt8 = runtimeEntityType.AddProperty(
+                "UInt8",
+                typeof(byte),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (byte)0);
+            uInt8.SetGetter(
+                byte (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt8(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt8(instance) == 0);
+            uInt8.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt8(instance) = value;
+                    return instance;
+                });
+            uInt8.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt8(instance) = value;
+                    return instance;
+                });
+            uInt8.SetAccessors(
+                byte (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt8(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte (IInternalEntry entry) => entry.ReadOriginalValue<byte>(uInt8, 235),
+                byte (IInternalEntry entry) => entry.GetCurrentValue<byte>(uInt8));
+            uInt8.SetPropertyIndexes(
+                index: 235,
+                originalValueIndex: 235,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt8.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                keyComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v));
+
+            var uInt8Array = runtimeEntityType.AddProperty(
+                "UInt8Array",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt8Array.SetGetter(
+                byte[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt8Array(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UInt8Array(instance) == null);
+            uInt8Array.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt8Array(instance) = value;
+                    return instance;
+                });
+            uInt8Array.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, byte[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UInt8Array(instance) = value;
+                    return instance;
+                });
+            uInt8Array.SetAccessors(
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UInt8Array(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(uInt8Array, 236),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(uInt8Array));
+            uInt8Array.SetPropertyIndexes(
+                index: 236,
+                originalValueIndex: 236,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt8Array.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var uInt8ReadOnlyCollection = runtimeEntityType.AddProperty(
+                "UInt8ReadOnlyCollection",
+                typeof(IReadOnlyCollection<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8ReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_uInt8ReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt8ReadOnlyCollection.SetGetter(
+                IReadOnlyCollection<byte> (CompiledModelTestBase.ManyTypes instance) => (ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance) == null ? null : ((IReadOnlyCollection<byte>)(ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance)))),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance) == null);
+            uInt8ReadOnlyCollection.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<byte> value) =>
+                {
+                    ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance) = ((List<byte>)value);
+                    return instance;
+                });
+            uInt8ReadOnlyCollection.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, IReadOnlyCollection<byte> value) =>
+                {
+                    ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(instance) = ((List<byte>)value);
+                    return instance;
+                });
+            uInt8ReadOnlyCollection.SetAccessors(
+                IReadOnlyCollection<byte> (IInternalEntry entry) => ((IReadOnlyCollection<byte>)(ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<byte> (IInternalEntry entry) => ((IReadOnlyCollection<byte>)(ManyTypesUnsafeAccessors._uInt8ReadOnlyCollection(((CompiledModelTestBase.ManyTypes)(entry.Entity))))),
+                IReadOnlyCollection<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IReadOnlyCollection<byte>>(uInt8ReadOnlyCollection, 237),
+                IReadOnlyCollection<byte> (IInternalEntry entry) => entry.GetCurrentValue<IReadOnlyCollection<byte>>(uInt8ReadOnlyCollection));
+            uInt8ReadOnlyCollection.SetPropertyIndexes(
+                index: 237,
+                originalValueIndex: 237,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uInt8ReadOnlyCollection.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var uInt8ReadOnlyCollectionElementType = uInt8ReadOnlyCollection.SetElementType(typeof(byte));
+            uInt8ReadOnlyCollectionElementType.TypeMapping = uInt8ReadOnlyCollection.TypeMapping.ElementTypeMapping;
+
+            var uri = runtimeEntityType.AddProperty(
+                "Uri",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Uri", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Uri>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uri.SetGetter(
+                Uri (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Uri(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.Uri(instance) == null);
+            uri.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.Uri(instance) = value;
+                    return instance;
+                });
+            uri.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.Uri(instance) = value;
+                    return instance;
+                });
+            uri.SetAccessors(
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.Uri(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.Uri(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => entry.ReadOriginalValue<Uri>(uri, 238),
+                Uri (IInternalEntry entry) => entry.GetCurrentValue<Uri>(uri));
+            uri.SetPropertyIndexes(
+                index: 238,
+                originalValueIndex: 238,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uri.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                keyComparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<Uri, string>(
+                    string (Uri v) => ((object)v).ToString(),
+                    Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))));
+
+            var uriArray = runtimeEntityType.AddProperty(
+                "UriArray",
+                typeof(Uri[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UriArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UriArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uriArray.SetGetter(
+                Uri[] (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UriArray(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UriArray(instance) == null);
+            uriArray.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UriArray(instance) = value;
+                    return instance;
+                });
+            uriArray.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri[] value) =>
+                {
+                    ManyTypesUnsafeAccessors.UriArray(instance) = value;
+                    return instance;
+                });
+            uriArray.SetAccessors(
+                Uri[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UriArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri[] (IInternalEntry entry) => ManyTypesUnsafeAccessors.UriArray(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri[] (IInternalEntry entry) => entry.ReadOriginalValue<Uri[]>(uriArray, 239),
+                Uri[] (IInternalEntry entry) => entry.GetCurrentValue<Uri[]>(uriArray));
+            uriArray.SetPropertyIndexes(
+                index: 239,
+                originalValueIndex: 239,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uriArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<Uri[], Uri>(new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<Uri[], Uri>(new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<Uri>(new JsonCollectionOfReferencesReaderWriter<Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Uri>(
+                        bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (Uri v) => ((object)v).GetHashCode(),
+                        Uri (Uri v) => v),
+                    keyComparer: new ValueComparer<Uri>(
+                        bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (Uri v) => ((object)v).GetHashCode(),
+                        Uri (Uri v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            string (Uri v) => ((object)v).ToString(),
+                            Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))));
+            var uriArrayElementType = uriArray.SetElementType(typeof(Uri));
+            uriArrayElementType.TypeMapping = uriArray.TypeMapping.ElementTypeMapping;
+
+            var uriToStringConverterProperty = runtimeEntityType.AddProperty(
+                "UriToStringConverterProperty",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UriToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UriToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new UriToStringConverter());
+            uriToStringConverterProperty.SetGetter(
+                Uri (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UriToStringConverterProperty(instance),
+                bool (CompiledModelTestBase.ManyTypes instance) => ManyTypesUnsafeAccessors.UriToStringConverterProperty(instance) == null);
+            uriToStringConverterProperty.SetSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.UriToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            uriToStringConverterProperty.SetMaterializationSetter(
+                CompiledModelTestBase.ManyTypes (CompiledModelTestBase.ManyTypes instance, Uri value) =>
+                {
+                    ManyTypesUnsafeAccessors.UriToStringConverterProperty(instance) = value;
+                    return instance;
+                });
+            uriToStringConverterProperty.SetAccessors(
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.UriToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => ManyTypesUnsafeAccessors.UriToStringConverterProperty(((CompiledModelTestBase.ManyTypes)(entry.Entity))),
+                Uri (IInternalEntry entry) => entry.ReadOriginalValue<Uri>(uriToStringConverterProperty, 240),
+                Uri (IInternalEntry entry) => entry.GetCurrentValue<Uri>(uriToStringConverterProperty));
+            uriToStringConverterProperty.SetPropertyIndexes(
+                index: 240,
+                originalValueIndex: 240,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            uriToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                keyComparer: new ValueComparer<Uri>(
+                    bool (Uri v1, Uri v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (Uri v) => ((object)v).GetHashCode(),
+                    Uri (Uri v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new ValueConverter<Uri, string>(
+                    string (Uri v) => ((object)v).ToString(),
+                    Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Uri, string>(
+                        string (Uri v) => ((object)v).ToString(),
+                        Uri (string v) => new Uri(v, UriKind.RelativeOrAbsolute))));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var @bool = runtimeEntityType.FindProperty("Bool");
+            var boolArray = runtimeEntityType.FindProperty("BoolArray");
+            var boolReadOnlyCollection = runtimeEntityType.FindProperty("BoolReadOnlyCollection");
+            var boolToStringConverterProperty = runtimeEntityType.FindProperty("BoolToStringConverterProperty");
+            var boolToTwoValuesConverterProperty = runtimeEntityType.FindProperty("BoolToTwoValuesConverterProperty");
+            var boolToZeroOneConverterProperty = runtimeEntityType.FindProperty("BoolToZeroOneConverterProperty");
+            var bytes = runtimeEntityType.FindProperty("Bytes");
+            var bytesArray = runtimeEntityType.FindProperty("BytesArray");
+            var bytesToStringConverterProperty = runtimeEntityType.FindProperty("BytesToStringConverterProperty");
+            var castingConverterProperty = runtimeEntityType.FindProperty("CastingConverterProperty");
+            var @char = runtimeEntityType.FindProperty("Char");
+            var charArray = runtimeEntityType.FindProperty("CharArray");
+            var charToStringConverterProperty = runtimeEntityType.FindProperty("CharToStringConverterProperty");
+            var dateOnly = runtimeEntityType.FindProperty("DateOnly");
+            var dateOnlyArray = runtimeEntityType.FindProperty("DateOnlyArray");
+            var dateOnlyToStringConverterProperty = runtimeEntityType.FindProperty("DateOnlyToStringConverterProperty");
+            var dateTime = runtimeEntityType.FindProperty("DateTime");
+            var dateTimeArray = runtimeEntityType.FindProperty("DateTimeArray");
+            var dateTimeOffsetToBinaryConverterProperty = runtimeEntityType.FindProperty("DateTimeOffsetToBinaryConverterProperty");
+            var dateTimeOffsetToBytesConverterProperty = runtimeEntityType.FindProperty("DateTimeOffsetToBytesConverterProperty");
+            var dateTimeOffsetToStringConverterProperty = runtimeEntityType.FindProperty("DateTimeOffsetToStringConverterProperty");
+            var dateTimeToBinaryConverterProperty = runtimeEntityType.FindProperty("DateTimeToBinaryConverterProperty");
+            var dateTimeToStringConverterProperty = runtimeEntityType.FindProperty("DateTimeToStringConverterProperty");
+            var dateTimeToTicksConverterProperty = runtimeEntityType.FindProperty("DateTimeToTicksConverterProperty");
+            var @decimal = runtimeEntityType.FindProperty("Decimal");
+            var decimalArray = runtimeEntityType.FindProperty("DecimalArray");
+            var decimalNumberToBytesConverterProperty = runtimeEntityType.FindProperty("DecimalNumberToBytesConverterProperty");
+            var decimalNumberToStringConverterProperty = runtimeEntityType.FindProperty("DecimalNumberToStringConverterProperty");
+            var @double = runtimeEntityType.FindProperty("Double");
+            var doubleArray = runtimeEntityType.FindProperty("DoubleArray");
+            var doubleNumberToBytesConverterProperty = runtimeEntityType.FindProperty("DoubleNumberToBytesConverterProperty");
+            var doubleNumberToStringConverterProperty = runtimeEntityType.FindProperty("DoubleNumberToStringConverterProperty");
+            var enum16 = runtimeEntityType.FindProperty("Enum16");
+            var enum16Array = runtimeEntityType.FindProperty("Enum16Array");
+            var enum16AsString = runtimeEntityType.FindProperty("Enum16AsString");
+            var enum16AsStringArray = runtimeEntityType.FindProperty("Enum16AsStringArray");
+            var enum16AsStringCollection = runtimeEntityType.FindProperty("Enum16AsStringCollection");
+            var enum16Collection = runtimeEntityType.FindProperty("Enum16Collection");
+            var enum32 = runtimeEntityType.FindProperty("Enum32");
+            var enum32Array = runtimeEntityType.FindProperty("Enum32Array");
+            var enum32AsString = runtimeEntityType.FindProperty("Enum32AsString");
+            var enum32AsStringArray = runtimeEntityType.FindProperty("Enum32AsStringArray");
+            var enum32AsStringCollection = runtimeEntityType.FindProperty("Enum32AsStringCollection");
+            var enum32Collection = runtimeEntityType.FindProperty("Enum32Collection");
+            var enum64 = runtimeEntityType.FindProperty("Enum64");
+            var enum64Array = runtimeEntityType.FindProperty("Enum64Array");
+            var enum64AsString = runtimeEntityType.FindProperty("Enum64AsString");
+            var enum64AsStringArray = runtimeEntityType.FindProperty("Enum64AsStringArray");
+            var enum64AsStringCollection = runtimeEntityType.FindProperty("Enum64AsStringCollection");
+            var enum64Collection = runtimeEntityType.FindProperty("Enum64Collection");
+            var enum8 = runtimeEntityType.FindProperty("Enum8");
+            var enum8Array = runtimeEntityType.FindProperty("Enum8Array");
+            var enum8AsString = runtimeEntityType.FindProperty("Enum8AsString");
+            var enum8AsStringArray = runtimeEntityType.FindProperty("Enum8AsStringArray");
+            var enum8AsStringCollection = runtimeEntityType.FindProperty("Enum8AsStringCollection");
+            var enum8Collection = runtimeEntityType.FindProperty("Enum8Collection");
+            var enumToNumberConverterProperty = runtimeEntityType.FindProperty("EnumToNumberConverterProperty");
+            var enumToStringConverterProperty = runtimeEntityType.FindProperty("EnumToStringConverterProperty");
+            var enumU16 = runtimeEntityType.FindProperty("EnumU16");
+            var enumU16Array = runtimeEntityType.FindProperty("EnumU16Array");
+            var enumU16AsString = runtimeEntityType.FindProperty("EnumU16AsString");
+            var enumU16AsStringArray = runtimeEntityType.FindProperty("EnumU16AsStringArray");
+            var enumU16AsStringCollection = runtimeEntityType.FindProperty("EnumU16AsStringCollection");
+            var enumU16Collection = runtimeEntityType.FindProperty("EnumU16Collection");
+            var enumU32 = runtimeEntityType.FindProperty("EnumU32");
+            var enumU32Array = runtimeEntityType.FindProperty("EnumU32Array");
+            var enumU32AsString = runtimeEntityType.FindProperty("EnumU32AsString");
+            var enumU32AsStringArray = runtimeEntityType.FindProperty("EnumU32AsStringArray");
+            var enumU32AsStringCollection = runtimeEntityType.FindProperty("EnumU32AsStringCollection");
+            var enumU32Collection = runtimeEntityType.FindProperty("EnumU32Collection");
+            var enumU64 = runtimeEntityType.FindProperty("EnumU64");
+            var enumU64Array = runtimeEntityType.FindProperty("EnumU64Array");
+            var enumU64AsString = runtimeEntityType.FindProperty("EnumU64AsString");
+            var enumU64AsStringArray = runtimeEntityType.FindProperty("EnumU64AsStringArray");
+            var enumU64AsStringCollection = runtimeEntityType.FindProperty("EnumU64AsStringCollection");
+            var enumU64Collection = runtimeEntityType.FindProperty("EnumU64Collection");
+            var enumU8 = runtimeEntityType.FindProperty("EnumU8");
+            var enumU8Array = runtimeEntityType.FindProperty("EnumU8Array");
+            var enumU8AsString = runtimeEntityType.FindProperty("EnumU8AsString");
+            var enumU8AsStringArray = runtimeEntityType.FindProperty("EnumU8AsStringArray");
+            var enumU8AsStringCollection = runtimeEntityType.FindProperty("EnumU8AsStringCollection");
+            var enumU8Collection = runtimeEntityType.FindProperty("EnumU8Collection");
+            var @float = runtimeEntityType.FindProperty("Float");
+            var floatArray = runtimeEntityType.FindProperty("FloatArray");
+            var guid = runtimeEntityType.FindProperty("Guid");
+            var guidArray = runtimeEntityType.FindProperty("GuidArray");
+            var guidToBytesConverterProperty = runtimeEntityType.FindProperty("GuidToBytesConverterProperty");
+            var guidToStringConverterProperty = runtimeEntityType.FindProperty("GuidToStringConverterProperty");
+            var iPAddress = runtimeEntityType.FindProperty("IPAddress");
+            var iPAddressArray = runtimeEntityType.FindProperty("IPAddressArray");
+            var iPAddressReadOnlyCollection = runtimeEntityType.FindProperty("IPAddressReadOnlyCollection");
+            var iPAddressToBytesConverterProperty = runtimeEntityType.FindProperty("IPAddressToBytesConverterProperty");
+            var iPAddressToStringConverterProperty = runtimeEntityType.FindProperty("IPAddressToStringConverterProperty");
+            var int16 = runtimeEntityType.FindProperty("Int16");
+            var int16Array = runtimeEntityType.FindProperty("Int16Array");
+            var int32 = runtimeEntityType.FindProperty("Int32");
+            var int32Array = runtimeEntityType.FindProperty("Int32Array");
+            var int32ReadOnlyCollection = runtimeEntityType.FindProperty("Int32ReadOnlyCollection");
+            var int64 = runtimeEntityType.FindProperty("Int64");
+            var int64Array = runtimeEntityType.FindProperty("Int64Array");
+            var int8 = runtimeEntityType.FindProperty("Int8");
+            var int8Array = runtimeEntityType.FindProperty("Int8Array");
+            var intNumberToBytesConverterProperty = runtimeEntityType.FindProperty("IntNumberToBytesConverterProperty");
+            var intNumberToStringConverterProperty = runtimeEntityType.FindProperty("IntNumberToStringConverterProperty");
+            var nullIntToNullStringConverterProperty = runtimeEntityType.FindProperty("NullIntToNullStringConverterProperty");
+            var nullableBool = runtimeEntityType.FindProperty("NullableBool");
+            var nullableBoolArray = runtimeEntityType.FindProperty("NullableBoolArray");
+            var nullableBytes = runtimeEntityType.FindProperty("NullableBytes");
+            var nullableBytesArray = runtimeEntityType.FindProperty("NullableBytesArray");
+            var nullableChar = runtimeEntityType.FindProperty("NullableChar");
+            var nullableCharArray = runtimeEntityType.FindProperty("NullableCharArray");
+            var nullableDateOnly = runtimeEntityType.FindProperty("NullableDateOnly");
+            var nullableDateOnlyArray = runtimeEntityType.FindProperty("NullableDateOnlyArray");
+            var nullableDateTime = runtimeEntityType.FindProperty("NullableDateTime");
+            var nullableDateTimeArray = runtimeEntityType.FindProperty("NullableDateTimeArray");
+            var nullableDecimal = runtimeEntityType.FindProperty("NullableDecimal");
+            var nullableDecimalArray = runtimeEntityType.FindProperty("NullableDecimalArray");
+            var nullableDouble = runtimeEntityType.FindProperty("NullableDouble");
+            var nullableDoubleArray = runtimeEntityType.FindProperty("NullableDoubleArray");
+            var nullableEnum16 = runtimeEntityType.FindProperty("NullableEnum16");
+            var nullableEnum16Array = runtimeEntityType.FindProperty("NullableEnum16Array");
+            var nullableEnum16AsString = runtimeEntityType.FindProperty("NullableEnum16AsString");
+            var nullableEnum16AsStringArray = runtimeEntityType.FindProperty("NullableEnum16AsStringArray");
+            var nullableEnum16AsStringCollection = runtimeEntityType.FindProperty("NullableEnum16AsStringCollection");
+            var nullableEnum16Collection = runtimeEntityType.FindProperty("NullableEnum16Collection");
+            var nullableEnum32 = runtimeEntityType.FindProperty("NullableEnum32");
+            var nullableEnum32Array = runtimeEntityType.FindProperty("NullableEnum32Array");
+            var nullableEnum32AsString = runtimeEntityType.FindProperty("NullableEnum32AsString");
+            var nullableEnum32AsStringArray = runtimeEntityType.FindProperty("NullableEnum32AsStringArray");
+            var nullableEnum32AsStringCollection = runtimeEntityType.FindProperty("NullableEnum32AsStringCollection");
+            var nullableEnum32Collection = runtimeEntityType.FindProperty("NullableEnum32Collection");
+            var nullableEnum64 = runtimeEntityType.FindProperty("NullableEnum64");
+            var nullableEnum64Array = runtimeEntityType.FindProperty("NullableEnum64Array");
+            var nullableEnum64AsString = runtimeEntityType.FindProperty("NullableEnum64AsString");
+            var nullableEnum64AsStringArray = runtimeEntityType.FindProperty("NullableEnum64AsStringArray");
+            var nullableEnum64AsStringCollection = runtimeEntityType.FindProperty("NullableEnum64AsStringCollection");
+            var nullableEnum64Collection = runtimeEntityType.FindProperty("NullableEnum64Collection");
+            var nullableEnum8 = runtimeEntityType.FindProperty("NullableEnum8");
+            var nullableEnum8Array = runtimeEntityType.FindProperty("NullableEnum8Array");
+            var nullableEnum8AsString = runtimeEntityType.FindProperty("NullableEnum8AsString");
+            var nullableEnum8AsStringArray = runtimeEntityType.FindProperty("NullableEnum8AsStringArray");
+            var nullableEnum8AsStringCollection = runtimeEntityType.FindProperty("NullableEnum8AsStringCollection");
+            var nullableEnum8Collection = runtimeEntityType.FindProperty("NullableEnum8Collection");
+            var nullableEnumU16 = runtimeEntityType.FindProperty("NullableEnumU16");
+            var nullableEnumU16Array = runtimeEntityType.FindProperty("NullableEnumU16Array");
+            var nullableEnumU16AsString = runtimeEntityType.FindProperty("NullableEnumU16AsString");
+            var nullableEnumU16AsStringArray = runtimeEntityType.FindProperty("NullableEnumU16AsStringArray");
+            var nullableEnumU16AsStringCollection = runtimeEntityType.FindProperty("NullableEnumU16AsStringCollection");
+            var nullableEnumU16Collection = runtimeEntityType.FindProperty("NullableEnumU16Collection");
+            var nullableEnumU32 = runtimeEntityType.FindProperty("NullableEnumU32");
+            var nullableEnumU32Array = runtimeEntityType.FindProperty("NullableEnumU32Array");
+            var nullableEnumU32AsString = runtimeEntityType.FindProperty("NullableEnumU32AsString");
+            var nullableEnumU32AsStringArray = runtimeEntityType.FindProperty("NullableEnumU32AsStringArray");
+            var nullableEnumU32AsStringCollection = runtimeEntityType.FindProperty("NullableEnumU32AsStringCollection");
+            var nullableEnumU32Collection = runtimeEntityType.FindProperty("NullableEnumU32Collection");
+            var nullableEnumU64 = runtimeEntityType.FindProperty("NullableEnumU64");
+            var nullableEnumU64Array = runtimeEntityType.FindProperty("NullableEnumU64Array");
+            var nullableEnumU64AsString = runtimeEntityType.FindProperty("NullableEnumU64AsString");
+            var nullableEnumU64AsStringArray = runtimeEntityType.FindProperty("NullableEnumU64AsStringArray");
+            var nullableEnumU64AsStringCollection = runtimeEntityType.FindProperty("NullableEnumU64AsStringCollection");
+            var nullableEnumU64Collection = runtimeEntityType.FindProperty("NullableEnumU64Collection");
+            var nullableEnumU8 = runtimeEntityType.FindProperty("NullableEnumU8");
+            var nullableEnumU8Array = runtimeEntityType.FindProperty("NullableEnumU8Array");
+            var nullableEnumU8AsString = runtimeEntityType.FindProperty("NullableEnumU8AsString");
+            var nullableEnumU8AsStringArray = runtimeEntityType.FindProperty("NullableEnumU8AsStringArray");
+            var nullableEnumU8AsStringCollection = runtimeEntityType.FindProperty("NullableEnumU8AsStringCollection");
+            var nullableEnumU8Collection = runtimeEntityType.FindProperty("NullableEnumU8Collection");
+            var nullableFloat = runtimeEntityType.FindProperty("NullableFloat");
+            var nullableFloatArray = runtimeEntityType.FindProperty("NullableFloatArray");
+            var nullableGuid = runtimeEntityType.FindProperty("NullableGuid");
+            var nullableGuidArray = runtimeEntityType.FindProperty("NullableGuidArray");
+            var nullableIPAddress = runtimeEntityType.FindProperty("NullableIPAddress");
+            var nullableIPAddressArray = runtimeEntityType.FindProperty("NullableIPAddressArray");
+            var nullableInt16 = runtimeEntityType.FindProperty("NullableInt16");
+            var nullableInt16Array = runtimeEntityType.FindProperty("NullableInt16Array");
+            var nullableInt32 = runtimeEntityType.FindProperty("NullableInt32");
+            var nullableInt32Array = runtimeEntityType.FindProperty("NullableInt32Array");
+            var nullableInt64 = runtimeEntityType.FindProperty("NullableInt64");
+            var nullableInt64Array = runtimeEntityType.FindProperty("NullableInt64Array");
+            var nullableInt8 = runtimeEntityType.FindProperty("NullableInt8");
+            var nullableInt8Array = runtimeEntityType.FindProperty("NullableInt8Array");
+            var nullablePhysicalAddress = runtimeEntityType.FindProperty("NullablePhysicalAddress");
+            var nullablePhysicalAddressArray = runtimeEntityType.FindProperty("NullablePhysicalAddressArray");
+            var nullableString = runtimeEntityType.FindProperty("NullableString");
+            var nullableStringArray = runtimeEntityType.FindProperty("NullableStringArray");
+            var nullableTimeOnly = runtimeEntityType.FindProperty("NullableTimeOnly");
+            var nullableTimeOnlyArray = runtimeEntityType.FindProperty("NullableTimeOnlyArray");
+            var nullableTimeSpan = runtimeEntityType.FindProperty("NullableTimeSpan");
+            var nullableTimeSpanArray = runtimeEntityType.FindProperty("NullableTimeSpanArray");
+            var nullableUInt16 = runtimeEntityType.FindProperty("NullableUInt16");
+            var nullableUInt16Array = runtimeEntityType.FindProperty("NullableUInt16Array");
+            var nullableUInt32 = runtimeEntityType.FindProperty("NullableUInt32");
+            var nullableUInt32Array = runtimeEntityType.FindProperty("NullableUInt32Array");
+            var nullableUInt64 = runtimeEntityType.FindProperty("NullableUInt64");
+            var nullableUInt64Array = runtimeEntityType.FindProperty("NullableUInt64Array");
+            var nullableUInt8 = runtimeEntityType.FindProperty("NullableUInt8");
+            var nullableUInt8Array = runtimeEntityType.FindProperty("NullableUInt8Array");
+            var nullableUri = runtimeEntityType.FindProperty("NullableUri");
+            var nullableUriArray = runtimeEntityType.FindProperty("NullableUriArray");
+            var physicalAddress = runtimeEntityType.FindProperty("PhysicalAddress");
+            var physicalAddressArray = runtimeEntityType.FindProperty("PhysicalAddressArray");
+            var physicalAddressToBytesConverterProperty = runtimeEntityType.FindProperty("PhysicalAddressToBytesConverterProperty");
+            var physicalAddressToStringConverterProperty = runtimeEntityType.FindProperty("PhysicalAddressToStringConverterProperty");
+            var @string = runtimeEntityType.FindProperty("String");
+            var stringArray = runtimeEntityType.FindProperty("StringArray");
+            var stringReadOnlyCollection = runtimeEntityType.FindProperty("StringReadOnlyCollection");
+            var stringToBoolConverterProperty = runtimeEntityType.FindProperty("StringToBoolConverterProperty");
+            var stringToBytesConverterProperty = runtimeEntityType.FindProperty("StringToBytesConverterProperty");
+            var stringToCharConverterProperty = runtimeEntityType.FindProperty("StringToCharConverterProperty");
+            var stringToDateOnlyConverterProperty = runtimeEntityType.FindProperty("StringToDateOnlyConverterProperty");
+            var stringToDateTimeConverterProperty = runtimeEntityType.FindProperty("StringToDateTimeConverterProperty");
+            var stringToDateTimeOffsetConverterProperty = runtimeEntityType.FindProperty("StringToDateTimeOffsetConverterProperty");
+            var stringToDecimalNumberConverterProperty = runtimeEntityType.FindProperty("StringToDecimalNumberConverterProperty");
+            var stringToDoubleNumberConverterProperty = runtimeEntityType.FindProperty("StringToDoubleNumberConverterProperty");
+            var stringToEnumConverterProperty = runtimeEntityType.FindProperty("StringToEnumConverterProperty");
+            var stringToGuidConverterProperty = runtimeEntityType.FindProperty("StringToGuidConverterProperty");
+            var stringToIntNumberConverterProperty = runtimeEntityType.FindProperty("StringToIntNumberConverterProperty");
+            var stringToTimeOnlyConverterProperty = runtimeEntityType.FindProperty("StringToTimeOnlyConverterProperty");
+            var stringToTimeSpanConverterProperty = runtimeEntityType.FindProperty("StringToTimeSpanConverterProperty");
+            var stringToUriConverterProperty = runtimeEntityType.FindProperty("StringToUriConverterProperty");
+            var timeOnly = runtimeEntityType.FindProperty("TimeOnly");
+            var timeOnlyArray = runtimeEntityType.FindProperty("TimeOnlyArray");
+            var timeOnlyToStringConverterProperty = runtimeEntityType.FindProperty("TimeOnlyToStringConverterProperty");
+            var timeOnlyToTicksConverterProperty = runtimeEntityType.FindProperty("TimeOnlyToTicksConverterProperty");
+            var timeSpan = runtimeEntityType.FindProperty("TimeSpan");
+            var timeSpanArray = runtimeEntityType.FindProperty("TimeSpanArray");
+            var timeSpanToStringConverterProperty = runtimeEntityType.FindProperty("TimeSpanToStringConverterProperty");
+            var timeSpanToTicksConverterProperty = runtimeEntityType.FindProperty("TimeSpanToTicksConverterProperty");
+            var uInt16 = runtimeEntityType.FindProperty("UInt16");
+            var uInt16Array = runtimeEntityType.FindProperty("UInt16Array");
+            var uInt32 = runtimeEntityType.FindProperty("UInt32");
+            var uInt32Array = runtimeEntityType.FindProperty("UInt32Array");
+            var uInt64 = runtimeEntityType.FindProperty("UInt64");
+            var uInt64Array = runtimeEntityType.FindProperty("UInt64Array");
+            var uInt8 = runtimeEntityType.FindProperty("UInt8");
+            var uInt8Array = runtimeEntityType.FindProperty("UInt8Array");
+            var uInt8ReadOnlyCollection = runtimeEntityType.FindProperty("UInt8ReadOnlyCollection");
+            var uri = runtimeEntityType.FindProperty("Uri");
+            var uriArray = runtimeEntityType.FindProperty("UriArray");
+            var uriToStringConverterProperty = runtimeEntityType.FindProperty("UriToStringConverterProperty");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNonNullableFactory<CompiledModelTestBase.ManyTypesId>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<CompiledModelTestBase.ManyTypesId>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg = ((ISnapshot)(new Snapshot<CompiledModelTestBase.ManyTypesId, bool, bool[], IReadOnlyCollection<bool>, bool, bool, bool, byte[], byte[][], byte[], int, char, char[], char, DateOnly, DateOnly[], DateOnly, DateTime, DateTime[], DateTimeOffset, DateTimeOffset, DateTimeOffset, DateTime, DateTime, DateTime, decimal, decimal[], decimal, decimal, double>(((ValueComparer<CompiledModelTestBase.ManyTypesId>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.ManyTypesId>(id)), ((ValueComparer<bool>)(((IProperty)@bool).GetValueComparer())).Snapshot(source.GetCurrentValue<bool>(@bool)), (((IEnumerable<bool>)(source.GetCurrentValue<bool[]>(boolArray))) == null ? null : ((bool[])(((ValueComparer<IEnumerable<bool>>)(((IProperty)boolArray).GetValueComparer())).Snapshot(((IEnumerable<bool>)(source.GetCurrentValue<bool[]>(boolArray))))))), (((IEnumerable<bool>)(source.GetCurrentValue<IReadOnlyCollection<bool>>(boolReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<bool>)(((ValueComparer<IEnumerable<bool>>)(((IProperty)boolReadOnlyCollection).GetValueComparer())).Snapshot(((IEnumerable<bool>)(source.GetCurrentValue<IReadOnlyCollection<bool>>(boolReadOnlyCollection))))))), ((ValueComparer<bool>)(((IProperty)boolToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<bool>(boolToStringConverterProperty)), ((ValueComparer<bool>)(((IProperty)boolToTwoValuesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<bool>(boolToTwoValuesConverterProperty)), ((ValueComparer<bool>)(((IProperty)boolToZeroOneConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<bool>(boolToZeroOneConverterProperty)), (source.GetCurrentValue<byte[]>(bytes) == null ? null : ((ValueComparer<byte[]>)(((IProperty)bytes).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(bytes))), (((object)(source.GetCurrentValue<byte[][]>(bytesArray))) == null ? null : ((byte[][])(((ValueComparer<object>)(((IProperty)bytesArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<byte[][]>(bytesArray))))))), (source.GetCurrentValue<byte[]>(bytesToStringConverterProperty) == null ? null : ((ValueComparer<byte[]>)(((IProperty)bytesToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(bytesToStringConverterProperty))), ((ValueComparer<int>)(((IProperty)castingConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(castingConverterProperty)), ((ValueComparer<char>)(((IProperty)@char).GetValueComparer())).Snapshot(source.GetCurrentValue<char>(@char)), (((IEnumerable<char>)(source.GetCurrentValue<char[]>(charArray))) == null ? null : ((char[])(((ValueComparer<IEnumerable<char>>)(((IProperty)charArray).GetValueComparer())).Snapshot(((IEnumerable<char>)(source.GetCurrentValue<char[]>(charArray))))))), ((ValueComparer<char>)(((IProperty)charToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<char>(charToStringConverterProperty)), ((ValueComparer<DateOnly>)(((IProperty)dateOnly).GetValueComparer())).Snapshot(source.GetCurrentValue<DateOnly>(dateOnly)), (((IEnumerable<DateOnly>)(source.GetCurrentValue<DateOnly[]>(dateOnlyArray))) == null ? null : ((DateOnly[])(((ValueComparer<IEnumerable<DateOnly>>)(((IProperty)dateOnlyArray).GetValueComparer())).Snapshot(((IEnumerable<DateOnly>)(source.GetCurrentValue<DateOnly[]>(dateOnlyArray))))))), ((ValueComparer<DateOnly>)(((IProperty)dateOnlyToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateOnly>(dateOnlyToStringConverterProperty)), ((ValueComparer<DateTime>)(((IProperty)dateTime).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime>(dateTime)), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(dateTimeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)dateTimeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(dateTimeArray))))))), ((ValueComparer<DateTimeOffset>)(((IProperty)dateTimeOffsetToBinaryConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToBinaryConverterProperty)), ((ValueComparer<DateTimeOffset>)(((IProperty)dateTimeOffsetToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToBytesConverterProperty)), ((ValueComparer<DateTimeOffset>)(((IProperty)dateTimeOffsetToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTimeOffset>(dateTimeOffsetToStringConverterProperty)), ((ValueComparer<DateTime>)(((IProperty)dateTimeToBinaryConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime>(dateTimeToBinaryConverterProperty)), ((ValueComparer<DateTime>)(((IProperty)dateTimeToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime>(dateTimeToStringConverterProperty)), ((ValueComparer<DateTime>)(((IProperty)dateTimeToTicksConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime>(dateTimeToTicksConverterProperty)), ((ValueComparer<decimal>)(((IProperty)@decimal).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal>(@decimal)), (((IEnumerable<decimal>)(source.GetCurrentValue<decimal[]>(decimalArray))) == null ? null : ((decimal[])(((ValueComparer<IEnumerable<decimal>>)(((IProperty)decimalArray).GetValueComparer())).Snapshot(((IEnumerable<decimal>)(source.GetCurrentValue<decimal[]>(decimalArray))))))), ((ValueComparer<decimal>)(((IProperty)decimalNumberToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal>(decimalNumberToBytesConverterProperty)), ((ValueComparer<decimal>)(((IProperty)decimalNumberToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal>(decimalNumberToStringConverterProperty)), ((ValueComparer<double>)(((IProperty)@double).GetValueComparer())).Snapshot(source.GetCurrentValue<double>(@double)))));
+                    var structuralType0 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg0 = ((ISnapshot)(new Snapshot<double[], double, double, CompiledModelTestBase.Enum16, CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16, CompiledModelTestBase.Enum16[], List<CompiledModelTestBase.Enum16>, List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum32, CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32, CompiledModelTestBase.Enum32[], List<CompiledModelTestBase.Enum32>, List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum64, CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64, CompiledModelTestBase.Enum64[], List<CompiledModelTestBase.Enum64>, List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum8, CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8, CompiledModelTestBase.Enum8[], List<CompiledModelTestBase.Enum8>, List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum32, CompiledModelTestBase.Enum32, CompiledModelTestBase.EnumU16>((((IEnumerable<double>)(source.GetCurrentValue<double[]>(doubleArray))) == null ? null : ((double[])(((ValueComparer<IEnumerable<double>>)(((IProperty)doubleArray).GetValueComparer())).Snapshot(((IEnumerable<double>)(source.GetCurrentValue<double[]>(doubleArray))))))), ((ValueComparer<double>)(((IProperty)doubleNumberToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<double>(doubleNumberToBytesConverterProperty)), ((ValueComparer<double>)(((IProperty)doubleNumberToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<double>(doubleNumberToStringConverterProperty)), ((ValueComparer<CompiledModelTestBase.Enum16>)(((IProperty)enum16).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum16>(enum16)), (((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16Array))) == null ? null : ((CompiledModelTestBase.Enum16[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16>>)(((IProperty)enum16Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16Array))))))), ((ValueComparer<CompiledModelTestBase.Enum16>)(((IProperty)enum16AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum16>(enum16AsString)), (((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum16[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16>>)(((IProperty)enum16AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<CompiledModelTestBase.Enum16[]>(enum16AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum16>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16>>)(((IProperty)enum16AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16Collection))) == null ? null : ((List<CompiledModelTestBase.Enum16>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16>>)(((IProperty)enum16Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16>>(enum16Collection))))))), ((ValueComparer<CompiledModelTestBase.Enum32>)(((IProperty)enum32).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32>(enum32)), (((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32Array))) == null ? null : ((CompiledModelTestBase.Enum32[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32>>)(((IProperty)enum32Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32Array))))))), ((ValueComparer<CompiledModelTestBase.Enum32>)(((IProperty)enum32AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32>(enum32AsString)), (((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum32[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32>>)(((IProperty)enum32AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<CompiledModelTestBase.Enum32[]>(enum32AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum32>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32>>)(((IProperty)enum32AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32Collection))) == null ? null : ((List<CompiledModelTestBase.Enum32>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32>>)(((IProperty)enum32Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32>>(enum32Collection))))))), ((ValueComparer<CompiledModelTestBase.Enum64>)(((IProperty)enum64).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum64>(enum64)), (((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64Array))) == null ? null : ((CompiledModelTestBase.Enum64[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64>>)(((IProperty)enum64Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64Array))))))), ((ValueComparer<CompiledModelTestBase.Enum64>)(((IProperty)enum64AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum64>(enum64AsString)), (((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum64[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64>>)(((IProperty)enum64AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<CompiledModelTestBase.Enum64[]>(enum64AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum64>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64>>)(((IProperty)enum64AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64Collection))) == null ? null : ((List<CompiledModelTestBase.Enum64>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64>>)(((IProperty)enum64Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64>>(enum64Collection))))))), ((ValueComparer<CompiledModelTestBase.Enum8>)(((IProperty)enum8).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum8>(enum8)), (((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8Array))) == null ? null : ((CompiledModelTestBase.Enum8[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8>>)(((IProperty)enum8Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8Array))))))), ((ValueComparer<CompiledModelTestBase.Enum8>)(((IProperty)enum8AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum8>(enum8AsString)), (((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum8[])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8>>)(((IProperty)enum8AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<CompiledModelTestBase.Enum8[]>(enum8AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum8>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8>>)(((IProperty)enum8AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8Collection))) == null ? null : ((List<CompiledModelTestBase.Enum8>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8>>)(((IProperty)enum8Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8>>(enum8Collection))))))), ((ValueComparer<CompiledModelTestBase.Enum32>)(((IProperty)enumToNumberConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32>(enumToNumberConverterProperty)), ((ValueComparer<CompiledModelTestBase.Enum32>)(((IProperty)enumToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32>(enumToStringConverterProperty)), ((ValueComparer<CompiledModelTestBase.EnumU16>)(((IProperty)enumU16).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU16>(enumU16)))));
+                    var structuralType1 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg1 = ((ISnapshot)(new Snapshot<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16, CompiledModelTestBase.EnumU16[], List<CompiledModelTestBase.EnumU16>, List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32[], List<CompiledModelTestBase.EnumU32>, List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU64, CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64, CompiledModelTestBase.EnumU64[], List<CompiledModelTestBase.EnumU64>, List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU8, CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8, CompiledModelTestBase.EnumU8[], List<CompiledModelTestBase.EnumU8>, List<CompiledModelTestBase.EnumU8>, float, float[], Guid, Guid[], Guid, Guid, IPAddress>((((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16Array))) == null ? null : ((CompiledModelTestBase.EnumU16[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16>>)(((IProperty)enumU16Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16Array))))))), ((ValueComparer<CompiledModelTestBase.EnumU16>)(((IProperty)enumU16AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU16>(enumU16AsString)), (((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU16[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16>>)(((IProperty)enumU16AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16[]>(enumU16AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU16>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16>>)(((IProperty)enumU16AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU16>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16>>)(((IProperty)enumU16Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16>>(enumU16Collection))))))), ((ValueComparer<CompiledModelTestBase.EnumU32>)(((IProperty)enumU32).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU32>(enumU32)), (((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32Array))) == null ? null : ((CompiledModelTestBase.EnumU32[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32>>)(((IProperty)enumU32Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32Array))))))), ((ValueComparer<CompiledModelTestBase.EnumU32>)(((IProperty)enumU32AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU32>(enumU32AsString)), (((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU32[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32>>)(((IProperty)enumU32AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32[]>(enumU32AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU32>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32>>)(((IProperty)enumU32AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU32>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32>>)(((IProperty)enumU32Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32>>(enumU32Collection))))))), ((ValueComparer<CompiledModelTestBase.EnumU64>)(((IProperty)enumU64).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU64>(enumU64)), (((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64Array))) == null ? null : ((CompiledModelTestBase.EnumU64[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64>>)(((IProperty)enumU64Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64Array))))))), ((ValueComparer<CompiledModelTestBase.EnumU64>)(((IProperty)enumU64AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU64>(enumU64AsString)), (((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU64[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64>>)(((IProperty)enumU64AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64[]>(enumU64AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU64>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64>>)(((IProperty)enumU64AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU64>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64>>)(((IProperty)enumU64Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64>>(enumU64Collection))))))), ((ValueComparer<CompiledModelTestBase.EnumU8>)(((IProperty)enumU8).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU8>(enumU8)), (((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8Array))) == null ? null : ((CompiledModelTestBase.EnumU8[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8>>)(((IProperty)enumU8Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8Array))))))), ((ValueComparer<CompiledModelTestBase.EnumU8>)(((IProperty)enumU8AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU8>(enumU8AsString)), (((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU8[])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8>>)(((IProperty)enumU8AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8[]>(enumU8AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU8>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8>>)(((IProperty)enumU8AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU8>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8>>)(((IProperty)enumU8Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8>>(enumU8Collection))))))), ((ValueComparer<float>)(((IProperty)@float).GetValueComparer())).Snapshot(source.GetCurrentValue<float>(@float)), (((IEnumerable<float>)(source.GetCurrentValue<float[]>(floatArray))) == null ? null : ((float[])(((ValueComparer<IEnumerable<float>>)(((IProperty)floatArray).GetValueComparer())).Snapshot(((IEnumerable<float>)(source.GetCurrentValue<float[]>(floatArray))))))), ((ValueComparer<Guid>)(((IProperty)guid).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(guid)), (((IEnumerable<Guid>)(source.GetCurrentValue<Guid[]>(guidArray))) == null ? null : ((Guid[])(((ValueComparer<IEnumerable<Guid>>)(((IProperty)guidArray).GetValueComparer())).Snapshot(((IEnumerable<Guid>)(source.GetCurrentValue<Guid[]>(guidArray))))))), ((ValueComparer<Guid>)(((IProperty)guidToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(guidToBytesConverterProperty)), ((ValueComparer<Guid>)(((IProperty)guidToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(guidToStringConverterProperty)), (source.GetCurrentValue<IPAddress>(iPAddress) == null ? null : ((ValueComparer<IPAddress>)(((IProperty)iPAddress).GetValueComparer())).Snapshot(source.GetCurrentValue<IPAddress>(iPAddress))))));
+                    var structuralType2 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg2 = ((ISnapshot)(new Snapshot<IPAddress[], IReadOnlyCollection<IPAddress>, IPAddress, IPAddress, short, short[], int, int[], IReadOnlyCollection<int>, long, long[], sbyte, sbyte[], int, int, int?, bool?, bool? [], byte[], byte[][], char?, char? [], DateOnly?, DateOnly? [], DateTime?, DateTime? [], decimal?, decimal? [], double?, double? []>((((object)(source.GetCurrentValue<IPAddress[]>(iPAddressArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)iPAddressArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(iPAddressArray))))))), (((object)(source.GetCurrentValue<IReadOnlyCollection<IPAddress>>(iPAddressReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<IPAddress>)(((ValueComparer<object>)(((IProperty)iPAddressReadOnlyCollection).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IReadOnlyCollection<IPAddress>>(iPAddressReadOnlyCollection))))))), (source.GetCurrentValue<IPAddress>(iPAddressToBytesConverterProperty) == null ? null : ((ValueComparer<IPAddress>)(((IProperty)iPAddressToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<IPAddress>(iPAddressToBytesConverterProperty))), (source.GetCurrentValue<IPAddress>(iPAddressToStringConverterProperty) == null ? null : ((ValueComparer<IPAddress>)(((IProperty)iPAddressToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<IPAddress>(iPAddressToStringConverterProperty))), ((ValueComparer<short>)(((IProperty)int16).GetValueComparer())).Snapshot(source.GetCurrentValue<short>(int16)), (((IEnumerable<short>)(source.GetCurrentValue<short[]>(int16Array))) == null ? null : ((short[])(((ValueComparer<IEnumerable<short>>)(((IProperty)int16Array).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<short[]>(int16Array))))))), ((ValueComparer<int>)(((IProperty)int32).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(int32)), (((IEnumerable<int>)(source.GetCurrentValue<int[]>(int32Array))) == null ? null : ((int[])(((ValueComparer<IEnumerable<int>>)(((IProperty)int32Array).GetValueComparer())).Snapshot(((IEnumerable<int>)(source.GetCurrentValue<int[]>(int32Array))))))), (((IEnumerable<int>)(source.GetCurrentValue<IReadOnlyCollection<int>>(int32ReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<int>)(((ValueComparer<IEnumerable<int>>)(((IProperty)int32ReadOnlyCollection).GetValueComparer())).Snapshot(((IEnumerable<int>)(source.GetCurrentValue<IReadOnlyCollection<int>>(int32ReadOnlyCollection))))))), ((ValueComparer<long>)(((IProperty)int64).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(int64)), (((IEnumerable<long>)(source.GetCurrentValue<long[]>(int64Array))) == null ? null : ((long[])(((ValueComparer<IEnumerable<long>>)(((IProperty)int64Array).GetValueComparer())).Snapshot(((IEnumerable<long>)(source.GetCurrentValue<long[]>(int64Array))))))), ((ValueComparer<sbyte>)(((IProperty)int8).GetValueComparer())).Snapshot(source.GetCurrentValue<sbyte>(int8)), (((IEnumerable<sbyte>)(source.GetCurrentValue<sbyte[]>(int8Array))) == null ? null : ((sbyte[])(((ValueComparer<IEnumerable<sbyte>>)(((IProperty)int8Array).GetValueComparer())).Snapshot(((IEnumerable<sbyte>)(source.GetCurrentValue<sbyte[]>(int8Array))))))), ((ValueComparer<int>)(((IProperty)intNumberToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(intNumberToBytesConverterProperty)), ((ValueComparer<int>)(((IProperty)intNumberToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(intNumberToStringConverterProperty)), (source.GetCurrentValue<int?>(nullIntToNullStringConverterProperty) == null ? null : ((ValueComparer<int?>)(((IProperty)nullIntToNullStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<int?>(nullIntToNullStringConverterProperty))), (source.GetCurrentValue<bool?>(nullableBool) == null ? null : ((ValueComparer<bool?>)(((IProperty)nullableBool).GetValueComparer())).Snapshot(source.GetCurrentValue<bool?>(nullableBool))), (((IEnumerable<bool?>)(source.GetCurrentValue<bool? []>(nullableBoolArray))) == null ? null : ((bool? [])(((ValueComparer<IEnumerable<bool?>>)(((IProperty)nullableBoolArray).GetValueComparer())).Snapshot(((IEnumerable<bool?>)(source.GetCurrentValue<bool? []>(nullableBoolArray))))))), (source.GetCurrentValue<byte[]>(nullableBytes) == null ? null : ((ValueComparer<byte[]>)(((IProperty)nullableBytes).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(nullableBytes))), (((object)(source.GetCurrentValue<byte[][]>(nullableBytesArray))) == null ? null : ((byte[][])(((ValueComparer<object>)(((IProperty)nullableBytesArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<byte[][]>(nullableBytesArray))))))), (source.GetCurrentValue<char?>(nullableChar) == null ? null : ((ValueComparer<char?>)(((IProperty)nullableChar).GetValueComparer())).Snapshot(source.GetCurrentValue<char?>(nullableChar))), (((IEnumerable<char?>)(source.GetCurrentValue<char? []>(nullableCharArray))) == null ? null : ((char? [])(((ValueComparer<IEnumerable<char?>>)(((IProperty)nullableCharArray).GetValueComparer())).Snapshot(((IEnumerable<char?>)(source.GetCurrentValue<char? []>(nullableCharArray))))))), (source.GetCurrentValue<DateOnly?>(nullableDateOnly) == null ? null : ((ValueComparer<DateOnly?>)(((IProperty)nullableDateOnly).GetValueComparer())).Snapshot(source.GetCurrentValue<DateOnly?>(nullableDateOnly))), (((IEnumerable<DateOnly?>)(source.GetCurrentValue<DateOnly? []>(nullableDateOnlyArray))) == null ? null : ((DateOnly? [])(((ValueComparer<IEnumerable<DateOnly?>>)(((IProperty)nullableDateOnlyArray).GetValueComparer())).Snapshot(((IEnumerable<DateOnly?>)(source.GetCurrentValue<DateOnly? []>(nullableDateOnlyArray))))))), (source.GetCurrentValue<DateTime?>(nullableDateTime) == null ? null : ((ValueComparer<DateTime?>)(((IProperty)nullableDateTime).GetValueComparer())).Snapshot(source.GetCurrentValue<DateTime?>(nullableDateTime))), (((IEnumerable<DateTime?>)(source.GetCurrentValue<DateTime? []>(nullableDateTimeArray))) == null ? null : ((DateTime? [])(((ValueComparer<IEnumerable<DateTime?>>)(((IProperty)nullableDateTimeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime?>)(source.GetCurrentValue<DateTime? []>(nullableDateTimeArray))))))), (source.GetCurrentValue<decimal?>(nullableDecimal) == null ? null : ((ValueComparer<decimal?>)(((IProperty)nullableDecimal).GetValueComparer())).Snapshot(source.GetCurrentValue<decimal?>(nullableDecimal))), (((IEnumerable<decimal?>)(source.GetCurrentValue<decimal? []>(nullableDecimalArray))) == null ? null : ((decimal? [])(((ValueComparer<IEnumerable<decimal?>>)(((IProperty)nullableDecimalArray).GetValueComparer())).Snapshot(((IEnumerable<decimal?>)(source.GetCurrentValue<decimal? []>(nullableDecimalArray))))))), (source.GetCurrentValue<double?>(nullableDouble) == null ? null : ((ValueComparer<double?>)(((IProperty)nullableDouble).GetValueComparer())).Snapshot(source.GetCurrentValue<double?>(nullableDouble))), (((IEnumerable<double?>)(source.GetCurrentValue<double? []>(nullableDoubleArray))) == null ? null : ((double? [])(((ValueComparer<IEnumerable<double?>>)(((IProperty)nullableDoubleArray).GetValueComparer())).Snapshot(((IEnumerable<double?>)(source.GetCurrentValue<double? []>(nullableDoubleArray))))))))));
+                    var structuralType3 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg3 = ((ISnapshot)(new Snapshot<CompiledModelTestBase.Enum16?, CompiledModelTestBase.Enum16? [], CompiledModelTestBase.Enum16?, CompiledModelTestBase.Enum16? [], List<CompiledModelTestBase.Enum16?>, List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum32?, CompiledModelTestBase.Enum32? [], CompiledModelTestBase.Enum32?, CompiledModelTestBase.Enum32? [], List<CompiledModelTestBase.Enum32?>, List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum64?, CompiledModelTestBase.Enum64? [], CompiledModelTestBase.Enum64?, CompiledModelTestBase.Enum64? [], List<CompiledModelTestBase.Enum64?>, List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum8?, CompiledModelTestBase.Enum8? [], CompiledModelTestBase.Enum8?, CompiledModelTestBase.Enum8? [], List<CompiledModelTestBase.Enum8?>, List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.EnumU16?, CompiledModelTestBase.EnumU16? [], CompiledModelTestBase.EnumU16?, CompiledModelTestBase.EnumU16? [], List<CompiledModelTestBase.EnumU16?>, List<CompiledModelTestBase.EnumU16?>>((source.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum16?>)(((IProperty)nullableEnum16).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16))), (((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16Array))) == null ? null : ((CompiledModelTestBase.Enum16? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16?>>)(((IProperty)nullableEnum16Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16Array))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum16?>)(((IProperty)nullableEnum16AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum16?>(nullableEnum16AsString))), (((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum16? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16?>>)(((IProperty)nullableEnum16AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<CompiledModelTestBase.Enum16? []>(nullableEnum16AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum16?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16?>>)(((IProperty)nullableEnum16AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16Collection))) == null ? null : ((List<CompiledModelTestBase.Enum16?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum16?>>)(((IProperty)nullableEnum16Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum16?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum16?>>(nullableEnum16Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum32?>)(((IProperty)nullableEnum32).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32))), (((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32Array))) == null ? null : ((CompiledModelTestBase.Enum32? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32?>>)(((IProperty)nullableEnum32Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32Array))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum32?>)(((IProperty)nullableEnum32AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum32?>(nullableEnum32AsString))), (((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum32? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32?>>)(((IProperty)nullableEnum32AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<CompiledModelTestBase.Enum32? []>(nullableEnum32AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum32?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32?>>)(((IProperty)nullableEnum32AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32Collection))) == null ? null : ((List<CompiledModelTestBase.Enum32?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum32?>>)(((IProperty)nullableEnum32Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum32?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum32?>>(nullableEnum32Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum64?>)(((IProperty)nullableEnum64).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64))), (((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64Array))) == null ? null : ((CompiledModelTestBase.Enum64? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64?>>)(((IProperty)nullableEnum64Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64Array))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum64?>)(((IProperty)nullableEnum64AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum64?>(nullableEnum64AsString))), (((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum64? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64?>>)(((IProperty)nullableEnum64AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<CompiledModelTestBase.Enum64? []>(nullableEnum64AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum64?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64?>>)(((IProperty)nullableEnum64AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64Collection))) == null ? null : ((List<CompiledModelTestBase.Enum64?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum64?>>)(((IProperty)nullableEnum64Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum64?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum64?>>(nullableEnum64Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum8?>)(((IProperty)nullableEnum8).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8))), (((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8Array))) == null ? null : ((CompiledModelTestBase.Enum8? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8?>>)(((IProperty)nullableEnum8Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8Array))))))), (source.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.Enum8?>)(((IProperty)nullableEnum8AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.Enum8?>(nullableEnum8AsString))), (((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8AsStringArray))) == null ? null : ((CompiledModelTestBase.Enum8? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8?>>)(((IProperty)nullableEnum8AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<CompiledModelTestBase.Enum8? []>(nullableEnum8AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.Enum8?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8?>>)(((IProperty)nullableEnum8AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8Collection))) == null ? null : ((List<CompiledModelTestBase.Enum8?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.Enum8?>>)(((IProperty)nullableEnum8Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.Enum8?>)(source.GetCurrentValue<List<CompiledModelTestBase.Enum8?>>(nullableEnum8Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU16?>)(((IProperty)nullableEnumU16).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16))), (((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16Array))) == null ? null : ((CompiledModelTestBase.EnumU16? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16?>>)(((IProperty)nullableEnumU16Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16Array))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU16?>)(((IProperty)nullableEnumU16AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU16?>(nullableEnumU16AsString))), (((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU16? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16?>>)(((IProperty)nullableEnumU16AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU16? []>(nullableEnumU16AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU16?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16?>>)(((IProperty)nullableEnumU16AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU16?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU16?>>)(((IProperty)nullableEnumU16Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU16?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU16?>>(nullableEnumU16Collection))))))))));
+                    var structuralType4 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg4 = ((ISnapshot)(new Snapshot<CompiledModelTestBase.EnumU32?, CompiledModelTestBase.EnumU32? [], CompiledModelTestBase.EnumU32?, CompiledModelTestBase.EnumU32? [], List<CompiledModelTestBase.EnumU32?>, List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU64?, CompiledModelTestBase.EnumU64? [], CompiledModelTestBase.EnumU64?, CompiledModelTestBase.EnumU64? [], List<CompiledModelTestBase.EnumU64?>, List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU8?, CompiledModelTestBase.EnumU8? [], CompiledModelTestBase.EnumU8?, CompiledModelTestBase.EnumU8? [], List<CompiledModelTestBase.EnumU8?>, List<CompiledModelTestBase.EnumU8?>, float?, float? [], Guid?, Guid? [], IPAddress, IPAddress[], short?, short? [], int?, int? [], long?, long? []>((source.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU32?>)(((IProperty)nullableEnumU32).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32))), (((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32Array))) == null ? null : ((CompiledModelTestBase.EnumU32? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32?>>)(((IProperty)nullableEnumU32Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32Array))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU32?>)(((IProperty)nullableEnumU32AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU32?>(nullableEnumU32AsString))), (((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU32? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32?>>)(((IProperty)nullableEnumU32AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU32? []>(nullableEnumU32AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU32?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32?>>)(((IProperty)nullableEnumU32AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU32?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU32?>>)(((IProperty)nullableEnumU32Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU32?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU32?>>(nullableEnumU32Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU64?>)(((IProperty)nullableEnumU64).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64))), (((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64Array))) == null ? null : ((CompiledModelTestBase.EnumU64? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64?>>)(((IProperty)nullableEnumU64Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64Array))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU64?>)(((IProperty)nullableEnumU64AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU64?>(nullableEnumU64AsString))), (((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU64? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64?>>)(((IProperty)nullableEnumU64AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU64? []>(nullableEnumU64AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU64?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64?>>)(((IProperty)nullableEnumU64AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU64?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU64?>>)(((IProperty)nullableEnumU64Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU64?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU64?>>(nullableEnumU64Collection))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU8?>)(((IProperty)nullableEnumU8).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8))), (((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8Array))) == null ? null : ((CompiledModelTestBase.EnumU8? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8?>>)(((IProperty)nullableEnumU8Array).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8Array))))))), (source.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8AsString) == null ? null : ((ValueComparer<CompiledModelTestBase.EnumU8?>)(((IProperty)nullableEnumU8AsString).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.EnumU8?>(nullableEnumU8AsString))), (((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8AsStringArray))) == null ? null : ((CompiledModelTestBase.EnumU8? [])(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8?>>)(((IProperty)nullableEnumU8AsStringArray).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<CompiledModelTestBase.EnumU8? []>(nullableEnumU8AsStringArray))))))), (((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8AsStringCollection))) == null ? null : ((List<CompiledModelTestBase.EnumU8?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8?>>)(((IProperty)nullableEnumU8AsStringCollection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8AsStringCollection))))))), (((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8Collection))) == null ? null : ((List<CompiledModelTestBase.EnumU8?>)(((ValueComparer<IEnumerable<CompiledModelTestBase.EnumU8?>>)(((IProperty)nullableEnumU8Collection).GetValueComparer())).Snapshot(((IEnumerable<CompiledModelTestBase.EnumU8?>)(source.GetCurrentValue<List<CompiledModelTestBase.EnumU8?>>(nullableEnumU8Collection))))))), (source.GetCurrentValue<float?>(nullableFloat) == null ? null : ((ValueComparer<float?>)(((IProperty)nullableFloat).GetValueComparer())).Snapshot(source.GetCurrentValue<float?>(nullableFloat))), (((IEnumerable<float?>)(source.GetCurrentValue<float? []>(nullableFloatArray))) == null ? null : ((float? [])(((ValueComparer<IEnumerable<float?>>)(((IProperty)nullableFloatArray).GetValueComparer())).Snapshot(((IEnumerable<float?>)(source.GetCurrentValue<float? []>(nullableFloatArray))))))), (source.GetCurrentValue<Guid?>(nullableGuid) == null ? null : ((ValueComparer<Guid?>)(((IProperty)nullableGuid).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid?>(nullableGuid))), (((IEnumerable<Guid?>)(source.GetCurrentValue<Guid? []>(nullableGuidArray))) == null ? null : ((Guid? [])(((ValueComparer<IEnumerable<Guid?>>)(((IProperty)nullableGuidArray).GetValueComparer())).Snapshot(((IEnumerable<Guid?>)(source.GetCurrentValue<Guid? []>(nullableGuidArray))))))), (source.GetCurrentValue<IPAddress>(nullableIPAddress) == null ? null : ((ValueComparer<IPAddress>)(((IProperty)nullableIPAddress).GetValueComparer())).Snapshot(source.GetCurrentValue<IPAddress>(nullableIPAddress))), (((object)(source.GetCurrentValue<IPAddress[]>(nullableIPAddressArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)nullableIPAddressArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(nullableIPAddressArray))))))), (source.GetCurrentValue<short?>(nullableInt16) == null ? null : ((ValueComparer<short?>)(((IProperty)nullableInt16).GetValueComparer())).Snapshot(source.GetCurrentValue<short?>(nullableInt16))), (((IEnumerable<short?>)(source.GetCurrentValue<short? []>(nullableInt16Array))) == null ? null : ((short? [])(((ValueComparer<IEnumerable<short?>>)(((IProperty)nullableInt16Array).GetValueComparer())).Snapshot(((IEnumerable<short?>)(source.GetCurrentValue<short? []>(nullableInt16Array))))))), (source.GetCurrentValue<int?>(nullableInt32) == null ? null : ((ValueComparer<int?>)(((IProperty)nullableInt32).GetValueComparer())).Snapshot(source.GetCurrentValue<int?>(nullableInt32))), (((IEnumerable<int?>)(source.GetCurrentValue<int? []>(nullableInt32Array))) == null ? null : ((int? [])(((ValueComparer<IEnumerable<int?>>)(((IProperty)nullableInt32Array).GetValueComparer())).Snapshot(((IEnumerable<int?>)(source.GetCurrentValue<int? []>(nullableInt32Array))))))), (source.GetCurrentValue<long?>(nullableInt64) == null ? null : ((ValueComparer<long?>)(((IProperty)nullableInt64).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(nullableInt64))), (((IEnumerable<long?>)(source.GetCurrentValue<long? []>(nullableInt64Array))) == null ? null : ((long? [])(((ValueComparer<IEnumerable<long?>>)(((IProperty)nullableInt64Array).GetValueComparer())).Snapshot(((IEnumerable<long?>)(source.GetCurrentValue<long? []>(nullableInt64Array))))))))));
+                    var structuralType5 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg5 = ((ISnapshot)(new Snapshot<sbyte?, sbyte? [], PhysicalAddress, PhysicalAddress[], string, string[], TimeOnly?, TimeOnly? [], TimeSpan?, TimeSpan? [], ushort?, ushort? [], uint?, uint? [], ulong?, ulong? [], byte?, byte? [], Uri, Uri[], PhysicalAddress, PhysicalAddress[], PhysicalAddress, PhysicalAddress, string, string[], IReadOnlyCollection<string>, string, string, string>((source.GetCurrentValue<sbyte?>(nullableInt8) == null ? null : ((ValueComparer<sbyte?>)(((IProperty)nullableInt8).GetValueComparer())).Snapshot(source.GetCurrentValue<sbyte?>(nullableInt8))), (((IEnumerable<sbyte?>)(source.GetCurrentValue<sbyte? []>(nullableInt8Array))) == null ? null : ((sbyte? [])(((ValueComparer<IEnumerable<sbyte?>>)(((IProperty)nullableInt8Array).GetValueComparer())).Snapshot(((IEnumerable<sbyte?>)(source.GetCurrentValue<sbyte? []>(nullableInt8Array))))))), (source.GetCurrentValue<PhysicalAddress>(nullablePhysicalAddress) == null ? null : ((ValueComparer<PhysicalAddress>)(((IProperty)nullablePhysicalAddress).GetValueComparer())).Snapshot(source.GetCurrentValue<PhysicalAddress>(nullablePhysicalAddress))), (((object)(source.GetCurrentValue<PhysicalAddress[]>(nullablePhysicalAddressArray))) == null ? null : ((PhysicalAddress[])(((ValueComparer<object>)(((IProperty)nullablePhysicalAddressArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<PhysicalAddress[]>(nullablePhysicalAddressArray))))))), (source.GetCurrentValue<string>(nullableString) == null ? null : ((ValueComparer<string>)(((IProperty)nullableString).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(nullableString))), (((object)(source.GetCurrentValue<string[]>(nullableStringArray))) == null ? null : ((string[])(((ValueComparer<object>)(((IProperty)nullableStringArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<string[]>(nullableStringArray))))))), (source.GetCurrentValue<TimeOnly?>(nullableTimeOnly) == null ? null : ((ValueComparer<TimeOnly?>)(((IProperty)nullableTimeOnly).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeOnly?>(nullableTimeOnly))), (((IEnumerable<TimeOnly?>)(source.GetCurrentValue<TimeOnly? []>(nullableTimeOnlyArray))) == null ? null : ((TimeOnly? [])(((ValueComparer<IEnumerable<TimeOnly?>>)(((IProperty)nullableTimeOnlyArray).GetValueComparer())).Snapshot(((IEnumerable<TimeOnly?>)(source.GetCurrentValue<TimeOnly? []>(nullableTimeOnlyArray))))))), (source.GetCurrentValue<TimeSpan?>(nullableTimeSpan) == null ? null : ((ValueComparer<TimeSpan?>)(((IProperty)nullableTimeSpan).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeSpan?>(nullableTimeSpan))), (((IEnumerable<TimeSpan?>)(source.GetCurrentValue<TimeSpan? []>(nullableTimeSpanArray))) == null ? null : ((TimeSpan? [])(((ValueComparer<IEnumerable<TimeSpan?>>)(((IProperty)nullableTimeSpanArray).GetValueComparer())).Snapshot(((IEnumerable<TimeSpan?>)(source.GetCurrentValue<TimeSpan? []>(nullableTimeSpanArray))))))), (source.GetCurrentValue<ushort?>(nullableUInt16) == null ? null : ((ValueComparer<ushort?>)(((IProperty)nullableUInt16).GetValueComparer())).Snapshot(source.GetCurrentValue<ushort?>(nullableUInt16))), (((IEnumerable<ushort?>)(source.GetCurrentValue<ushort? []>(nullableUInt16Array))) == null ? null : ((ushort? [])(((ValueComparer<IEnumerable<ushort?>>)(((IProperty)nullableUInt16Array).GetValueComparer())).Snapshot(((IEnumerable<ushort?>)(source.GetCurrentValue<ushort? []>(nullableUInt16Array))))))), (source.GetCurrentValue<uint?>(nullableUInt32) == null ? null : ((ValueComparer<uint?>)(((IProperty)nullableUInt32).GetValueComparer())).Snapshot(source.GetCurrentValue<uint?>(nullableUInt32))), (((IEnumerable<uint?>)(source.GetCurrentValue<uint? []>(nullableUInt32Array))) == null ? null : ((uint? [])(((ValueComparer<IEnumerable<uint?>>)(((IProperty)nullableUInt32Array).GetValueComparer())).Snapshot(((IEnumerable<uint?>)(source.GetCurrentValue<uint? []>(nullableUInt32Array))))))), (source.GetCurrentValue<ulong?>(nullableUInt64) == null ? null : ((ValueComparer<ulong?>)(((IProperty)nullableUInt64).GetValueComparer())).Snapshot(source.GetCurrentValue<ulong?>(nullableUInt64))), (((IEnumerable<ulong?>)(source.GetCurrentValue<ulong? []>(nullableUInt64Array))) == null ? null : ((ulong? [])(((ValueComparer<IEnumerable<ulong?>>)(((IProperty)nullableUInt64Array).GetValueComparer())).Snapshot(((IEnumerable<ulong?>)(source.GetCurrentValue<ulong? []>(nullableUInt64Array))))))), (source.GetCurrentValue<byte?>(nullableUInt8) == null ? null : ((ValueComparer<byte?>)(((IProperty)nullableUInt8).GetValueComparer())).Snapshot(source.GetCurrentValue<byte?>(nullableUInt8))), (((IEnumerable<byte?>)(source.GetCurrentValue<byte? []>(nullableUInt8Array))) == null ? null : ((byte? [])(((ValueComparer<IEnumerable<byte?>>)(((IProperty)nullableUInt8Array).GetValueComparer())).Snapshot(((IEnumerable<byte?>)(source.GetCurrentValue<byte? []>(nullableUInt8Array))))))), (source.GetCurrentValue<Uri>(nullableUri) == null ? null : ((ValueComparer<Uri>)(((IProperty)nullableUri).GetValueComparer())).Snapshot(source.GetCurrentValue<Uri>(nullableUri))), (((object)(source.GetCurrentValue<Uri[]>(nullableUriArray))) == null ? null : ((Uri[])(((ValueComparer<object>)(((IProperty)nullableUriArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<Uri[]>(nullableUriArray))))))), (source.GetCurrentValue<PhysicalAddress>(physicalAddress) == null ? null : ((ValueComparer<PhysicalAddress>)(((IProperty)physicalAddress).GetValueComparer())).Snapshot(source.GetCurrentValue<PhysicalAddress>(physicalAddress))), (((object)(source.GetCurrentValue<PhysicalAddress[]>(physicalAddressArray))) == null ? null : ((PhysicalAddress[])(((ValueComparer<object>)(((IProperty)physicalAddressArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<PhysicalAddress[]>(physicalAddressArray))))))), (source.GetCurrentValue<PhysicalAddress>(physicalAddressToBytesConverterProperty) == null ? null : ((ValueComparer<PhysicalAddress>)(((IProperty)physicalAddressToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<PhysicalAddress>(physicalAddressToBytesConverterProperty))), (source.GetCurrentValue<PhysicalAddress>(physicalAddressToStringConverterProperty) == null ? null : ((ValueComparer<PhysicalAddress>)(((IProperty)physicalAddressToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<PhysicalAddress>(physicalAddressToStringConverterProperty))), (source.GetCurrentValue<string>(@string) == null ? null : ((ValueComparer<string>)(((IProperty)@string).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(@string))), (((object)(source.GetCurrentValue<string[]>(stringArray))) == null ? null : ((string[])(((ValueComparer<object>)(((IProperty)stringArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<string[]>(stringArray))))))), (((object)(source.GetCurrentValue<IReadOnlyCollection<string>>(stringReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<string>)(((ValueComparer<object>)(((IProperty)stringReadOnlyCollection).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IReadOnlyCollection<string>>(stringReadOnlyCollection))))))), (source.GetCurrentValue<string>(stringToBoolConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToBoolConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToBoolConverterProperty))), (source.GetCurrentValue<string>(stringToBytesConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToBytesConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToBytesConverterProperty))), (source.GetCurrentValue<string>(stringToCharConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToCharConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToCharConverterProperty))))));
+                    var structuralType6 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    var liftedArg6 = ((ISnapshot)(new Snapshot<string, string, string, string, string, string, string, string, string, string, string, TimeOnly, TimeOnly[], TimeOnly, TimeOnly, TimeSpan, TimeSpan[], TimeSpan, TimeSpan, ushort, ushort[], uint, uint[], ulong, ulong[], byte, byte[], IReadOnlyCollection<byte>, Uri, Uri[]>((source.GetCurrentValue<string>(stringToDateOnlyConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDateOnlyConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDateOnlyConverterProperty))), (source.GetCurrentValue<string>(stringToDateTimeConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDateTimeConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDateTimeConverterProperty))), (source.GetCurrentValue<string>(stringToDateTimeOffsetConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDateTimeOffsetConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDateTimeOffsetConverterProperty))), (source.GetCurrentValue<string>(stringToDecimalNumberConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDecimalNumberConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDecimalNumberConverterProperty))), (source.GetCurrentValue<string>(stringToDoubleNumberConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToDoubleNumberConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToDoubleNumberConverterProperty))), (source.GetCurrentValue<string>(stringToEnumConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToEnumConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToEnumConverterProperty))), (source.GetCurrentValue<string>(stringToGuidConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToGuidConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToGuidConverterProperty))), (source.GetCurrentValue<string>(stringToIntNumberConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToIntNumberConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToIntNumberConverterProperty))), (source.GetCurrentValue<string>(stringToTimeOnlyConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToTimeOnlyConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToTimeOnlyConverterProperty))), (source.GetCurrentValue<string>(stringToTimeSpanConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToTimeSpanConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToTimeSpanConverterProperty))), (source.GetCurrentValue<string>(stringToUriConverterProperty) == null ? null : ((ValueComparer<string>)(((IProperty)stringToUriConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(stringToUriConverterProperty))), ((ValueComparer<TimeOnly>)(((IProperty)timeOnly).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeOnly>(timeOnly)), (((IEnumerable<TimeOnly>)(source.GetCurrentValue<TimeOnly[]>(timeOnlyArray))) == null ? null : ((TimeOnly[])(((ValueComparer<IEnumerable<TimeOnly>>)(((IProperty)timeOnlyArray).GetValueComparer())).Snapshot(((IEnumerable<TimeOnly>)(source.GetCurrentValue<TimeOnly[]>(timeOnlyArray))))))), ((ValueComparer<TimeOnly>)(((IProperty)timeOnlyToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeOnly>(timeOnlyToStringConverterProperty)), ((ValueComparer<TimeOnly>)(((IProperty)timeOnlyToTicksConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeOnly>(timeOnlyToTicksConverterProperty)), ((ValueComparer<TimeSpan>)(((IProperty)timeSpan).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeSpan>(timeSpan)), (((IEnumerable<TimeSpan>)(source.GetCurrentValue<TimeSpan[]>(timeSpanArray))) == null ? null : ((TimeSpan[])(((ValueComparer<IEnumerable<TimeSpan>>)(((IProperty)timeSpanArray).GetValueComparer())).Snapshot(((IEnumerable<TimeSpan>)(source.GetCurrentValue<TimeSpan[]>(timeSpanArray))))))), ((ValueComparer<TimeSpan>)(((IProperty)timeSpanToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeSpan>(timeSpanToStringConverterProperty)), ((ValueComparer<TimeSpan>)(((IProperty)timeSpanToTicksConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<TimeSpan>(timeSpanToTicksConverterProperty)), ((ValueComparer<ushort>)(((IProperty)uInt16).GetValueComparer())).Snapshot(source.GetCurrentValue<ushort>(uInt16)), (((IEnumerable<ushort>)(source.GetCurrentValue<ushort[]>(uInt16Array))) == null ? null : ((ushort[])(((ValueComparer<IEnumerable<ushort>>)(((IProperty)uInt16Array).GetValueComparer())).Snapshot(((IEnumerable<ushort>)(source.GetCurrentValue<ushort[]>(uInt16Array))))))), ((ValueComparer<uint>)(((IProperty)uInt32).GetValueComparer())).Snapshot(source.GetCurrentValue<uint>(uInt32)), (((IEnumerable<uint>)(source.GetCurrentValue<uint[]>(uInt32Array))) == null ? null : ((uint[])(((ValueComparer<IEnumerable<uint>>)(((IProperty)uInt32Array).GetValueComparer())).Snapshot(((IEnumerable<uint>)(source.GetCurrentValue<uint[]>(uInt32Array))))))), ((ValueComparer<ulong>)(((IProperty)uInt64).GetValueComparer())).Snapshot(source.GetCurrentValue<ulong>(uInt64)), (((IEnumerable<ulong>)(source.GetCurrentValue<ulong[]>(uInt64Array))) == null ? null : ((ulong[])(((ValueComparer<IEnumerable<ulong>>)(((IProperty)uInt64Array).GetValueComparer())).Snapshot(((IEnumerable<ulong>)(source.GetCurrentValue<ulong[]>(uInt64Array))))))), ((ValueComparer<byte>)(((IProperty)uInt8).GetValueComparer())).Snapshot(source.GetCurrentValue<byte>(uInt8)), (source.GetCurrentValue<byte[]>(uInt8Array) == null ? null : ((ValueComparer<byte[]>)(((IProperty)uInt8Array).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(uInt8Array))), (((IEnumerable<byte>)(source.GetCurrentValue<IReadOnlyCollection<byte>>(uInt8ReadOnlyCollection))) == null ? null : ((IReadOnlyCollection<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)uInt8ReadOnlyCollection).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IReadOnlyCollection<byte>>(uInt8ReadOnlyCollection))))))), (source.GetCurrentValue<Uri>(uri) == null ? null : ((ValueComparer<Uri>)(((IProperty)uri).GetValueComparer())).Snapshot(source.GetCurrentValue<Uri>(uri))), (((object)(source.GetCurrentValue<Uri[]>(uriArray))) == null ? null : ((Uri[])(((ValueComparer<object>)(((IProperty)uriArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<Uri[]>(uriArray))))))))));
+                    var structuralType7 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    return ((ISnapshot)(new MultiSnapshot(new ISnapshot[] { liftedArg, liftedArg0, liftedArg1, liftedArg2, liftedArg3, liftedArg4, liftedArg5, liftedArg6, ((ISnapshot)(new Snapshot<Uri>((source.GetCurrentValue<Uri>(uriToStringConverterProperty) == null ? null : ((ValueComparer<Uri>)(((IProperty)uriToStringConverterProperty).GetValueComparer())).Snapshot(source.GetCurrentValue<Uri>(uriToStringConverterProperty)))))) })));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<CompiledModelTestBase.ManyTypesId>(((ValueComparer<CompiledModelTestBase.ManyTypesId>)(((IProperty)id).GetValueComparer())).Snapshot(default(CompiledModelTestBase.ManyTypesId))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<CompiledModelTestBase.ManyTypesId>(default(CompiledModelTestBase.ManyTypesId)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => Snapshot.Empty);
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.ManyTypes)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<CompiledModelTestBase.ManyTypesId>(((ValueComparer<CompiledModelTestBase.ManyTypesId>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.ManyTypesId>(id)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 241,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 241,
+                shadowCount: 0,
+                relationshipCount: 1,
+                storeGeneratedCount: 1));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "ManyTypes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesUnsafeAccessors.cs
new file mode 100644
index 00000000..48de8dc1
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesUnsafeAccessors.cs
@@ -0,0 +1,739 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class ManyTypesUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref CompiledModelTestBase.ManyTypesId Id(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Bool>k__BackingField")]
+        public static extern ref bool Bool(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BoolArray>k__BackingField")]
+        public static extern ref bool[] BoolArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_boolReadOnlyCollection")]
+        public static extern ref List<bool> _boolReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BoolToStringConverterProperty>k__BackingField")]
+        public static extern ref bool BoolToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BoolToTwoValuesConverterProperty>k__BackingField")]
+        public static extern ref bool BoolToTwoValuesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BoolToZeroOneConverterProperty>k__BackingField")]
+        public static extern ref bool BoolToZeroOneConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Bytes>k__BackingField")]
+        public static extern ref byte[] Bytes(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BytesArray>k__BackingField")]
+        public static extern ref byte[][] BytesArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<BytesToStringConverterProperty>k__BackingField")]
+        public static extern ref byte[] BytesToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<CastingConverterProperty>k__BackingField")]
+        public static extern ref int CastingConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Char>k__BackingField")]
+        public static extern ref char Char(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<CharArray>k__BackingField")]
+        public static extern ref char[] CharArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<CharToStringConverterProperty>k__BackingField")]
+        public static extern ref char CharToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateOnly>k__BackingField")]
+        public static extern ref DateOnly DateOnly(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateOnlyArray>k__BackingField")]
+        public static extern ref DateOnly[] DateOnlyArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateOnlyToStringConverterProperty>k__BackingField")]
+        public static extern ref DateOnly DateOnlyToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTime>k__BackingField")]
+        public static extern ref DateTime DateTime(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeArray>k__BackingField")]
+        public static extern ref DateTime[] DateTimeArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeOffsetToBinaryConverterProperty>k__BackingField")]
+        public static extern ref DateTimeOffset DateTimeOffsetToBinaryConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeOffsetToBytesConverterProperty>k__BackingField")]
+        public static extern ref DateTimeOffset DateTimeOffsetToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeOffsetToStringConverterProperty>k__BackingField")]
+        public static extern ref DateTimeOffset DateTimeOffsetToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeToBinaryConverterProperty>k__BackingField")]
+        public static extern ref DateTime DateTimeToBinaryConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeToStringConverterProperty>k__BackingField")]
+        public static extern ref DateTime DateTimeToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DateTimeToTicksConverterProperty>k__BackingField")]
+        public static extern ref DateTime DateTimeToTicksConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Decimal>k__BackingField")]
+        public static extern ref decimal Decimal(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DecimalArray>k__BackingField")]
+        public static extern ref decimal[] DecimalArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DecimalNumberToBytesConverterProperty>k__BackingField")]
+        public static extern ref decimal DecimalNumberToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DecimalNumberToStringConverterProperty>k__BackingField")]
+        public static extern ref decimal DecimalNumberToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Double>k__BackingField")]
+        public static extern ref double Double(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DoubleArray>k__BackingField")]
+        public static extern ref double[] DoubleArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DoubleNumberToBytesConverterProperty>k__BackingField")]
+        public static extern ref double DoubleNumberToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<DoubleNumberToStringConverterProperty>k__BackingField")]
+        public static extern ref double DoubleNumberToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16 Enum16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16[] Enum16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16 Enum16AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16[] Enum16AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum16> Enum16AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum16Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum16> Enum16Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32 Enum32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32[] Enum32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32 Enum32AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32[] Enum32AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum32> Enum32AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum32Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum32> Enum32Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64 Enum64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64[] Enum64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64 Enum64AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64[] Enum64AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum64> Enum64AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum64Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum64> Enum64Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8 Enum8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8[] Enum8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8 Enum8AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8[] Enum8AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum8> Enum8AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum8Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum8> Enum8Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumToNumberConverterProperty>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32 EnumToNumberConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumToStringConverterProperty>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32 EnumToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16 EnumU16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16[] EnumU16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16 EnumU16AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16[] EnumU16AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU16> EnumU16AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU16Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU16> EnumU16Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32 EnumU32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32[] EnumU32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32 EnumU32AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32[] EnumU32AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU32> EnumU32AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU32Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU32> EnumU32Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64 EnumU64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64[] EnumU64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64 EnumU64AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64[] EnumU64AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU64> EnumU64AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU64Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU64> EnumU64Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8 EnumU8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8[] EnumU8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8 EnumU8AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8[] EnumU8AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU8> EnumU8AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<EnumU8Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU8> EnumU8Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Float>k__BackingField")]
+        public static extern ref float Float(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<FloatArray>k__BackingField")]
+        public static extern ref float[] FloatArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Guid>k__BackingField")]
+        public static extern ref Guid Guid(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<GuidArray>k__BackingField")]
+        public static extern ref Guid[] GuidArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<GuidToBytesConverterProperty>k__BackingField")]
+        public static extern ref Guid GuidToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<GuidToStringConverterProperty>k__BackingField")]
+        public static extern ref Guid GuidToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IPAddress>k__BackingField")]
+        public static extern ref IPAddress IPAddress(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IPAddressArray>k__BackingField")]
+        public static extern ref IPAddress[] IPAddressArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_ipAddressReadOnlyCollection")]
+        public static extern ref List<IPAddress> _ipAddressReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IPAddressToBytesConverterProperty>k__BackingField")]
+        public static extern ref IPAddress IPAddressToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IPAddressToStringConverterProperty>k__BackingField")]
+        public static extern ref IPAddress IPAddressToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int16>k__BackingField")]
+        public static extern ref short Int16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int16Array>k__BackingField")]
+        public static extern ref short[] Int16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int32>k__BackingField")]
+        public static extern ref int Int32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int32Array>k__BackingField")]
+        public static extern ref int[] Int32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_int32ReadOnlyCollection")]
+        public static extern ref List<int> _int32ReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int64>k__BackingField")]
+        public static extern ref long Int64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int64Array>k__BackingField")]
+        public static extern ref long[] Int64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int8>k__BackingField")]
+        public static extern ref sbyte Int8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Int8Array>k__BackingField")]
+        public static extern ref sbyte[] Int8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IntNumberToBytesConverterProperty>k__BackingField")]
+        public static extern ref int IntNumberToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<IntNumberToStringConverterProperty>k__BackingField")]
+        public static extern ref int IntNumberToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullIntToNullStringConverterProperty>k__BackingField")]
+        public static extern ref int? NullIntToNullStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableBool>k__BackingField")]
+        public static extern ref bool? NullableBool(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableBoolArray>k__BackingField")]
+        public static extern ref bool?[] NullableBoolArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableBytes>k__BackingField")]
+        public static extern ref byte[] NullableBytes(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableBytesArray>k__BackingField")]
+        public static extern ref byte[][] NullableBytesArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableChar>k__BackingField")]
+        public static extern ref char? NullableChar(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableCharArray>k__BackingField")]
+        public static extern ref char?[] NullableCharArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDateOnly>k__BackingField")]
+        public static extern ref DateOnly? NullableDateOnly(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDateOnlyArray>k__BackingField")]
+        public static extern ref DateOnly?[] NullableDateOnlyArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDateTime>k__BackingField")]
+        public static extern ref DateTime? NullableDateTime(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDateTimeArray>k__BackingField")]
+        public static extern ref DateTime?[] NullableDateTimeArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDecimal>k__BackingField")]
+        public static extern ref decimal? NullableDecimal(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDecimalArray>k__BackingField")]
+        public static extern ref decimal?[] NullableDecimalArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDouble>k__BackingField")]
+        public static extern ref double? NullableDouble(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableDoubleArray>k__BackingField")]
+        public static extern ref double?[] NullableDoubleArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16? NullableEnum16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16?[] NullableEnum16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16? NullableEnum16AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum16?[] NullableEnum16AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum16?> NullableEnum16AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum16Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum16?> NullableEnum16Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32? NullableEnum32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32?[] NullableEnum32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32? NullableEnum32AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum32?[] NullableEnum32AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum32?> NullableEnum32AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum32Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum32?> NullableEnum32Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64? NullableEnum64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64?[] NullableEnum64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64? NullableEnum64AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum64?[] NullableEnum64AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum64?> NullableEnum64AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum64Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum64?> NullableEnum64Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8? NullableEnum8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8?[] NullableEnum8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8? NullableEnum8AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.Enum8?[] NullableEnum8AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum8?> NullableEnum8AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnum8Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.Enum8?> NullableEnum8Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16? NullableEnumU16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16?[] NullableEnumU16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16? NullableEnumU16AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU16?[] NullableEnumU16AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU16?> NullableEnumU16AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU16Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU16?> NullableEnumU16Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32? NullableEnumU32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32?[] NullableEnumU32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32? NullableEnumU32AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU32?[] NullableEnumU32AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU32?> NullableEnumU32AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU32Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU32?> NullableEnumU32Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64? NullableEnumU64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64?[] NullableEnumU64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64? NullableEnumU64AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU64?[] NullableEnumU64AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU64?> NullableEnumU64AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU64Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU64?> NullableEnumU64Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8? NullableEnumU8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8Array>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8?[] NullableEnumU8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8AsString>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8? NullableEnumU8AsString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8AsStringArray>k__BackingField")]
+        public static extern ref CompiledModelTestBase.EnumU8?[] NullableEnumU8AsStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8AsStringCollection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU8?> NullableEnumU8AsStringCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableEnumU8Collection>k__BackingField")]
+        public static extern ref List<CompiledModelTestBase.EnumU8?> NullableEnumU8Collection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableFloat>k__BackingField")]
+        public static extern ref float? NullableFloat(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableFloatArray>k__BackingField")]
+        public static extern ref float?[] NullableFloatArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableGuid>k__BackingField")]
+        public static extern ref Guid? NullableGuid(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableGuidArray>k__BackingField")]
+        public static extern ref Guid?[] NullableGuidArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableIPAddress>k__BackingField")]
+        public static extern ref IPAddress NullableIPAddress(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableIPAddressArray>k__BackingField")]
+        public static extern ref IPAddress[] NullableIPAddressArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt16>k__BackingField")]
+        public static extern ref short? NullableInt16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt16Array>k__BackingField")]
+        public static extern ref short?[] NullableInt16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt32>k__BackingField")]
+        public static extern ref int? NullableInt32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt32Array>k__BackingField")]
+        public static extern ref int?[] NullableInt32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt64>k__BackingField")]
+        public static extern ref long? NullableInt64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt64Array>k__BackingField")]
+        public static extern ref long?[] NullableInt64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt8>k__BackingField")]
+        public static extern ref sbyte? NullableInt8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableInt8Array>k__BackingField")]
+        public static extern ref sbyte?[] NullableInt8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullablePhysicalAddress>k__BackingField")]
+        public static extern ref PhysicalAddress NullablePhysicalAddress(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullablePhysicalAddressArray>k__BackingField")]
+        public static extern ref PhysicalAddress[] NullablePhysicalAddressArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableString>k__BackingField")]
+        public static extern ref string NullableString(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableStringArray>k__BackingField")]
+        public static extern ref string[] NullableStringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableTimeOnly>k__BackingField")]
+        public static extern ref TimeOnly? NullableTimeOnly(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableTimeOnlyArray>k__BackingField")]
+        public static extern ref TimeOnly?[] NullableTimeOnlyArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableTimeSpan>k__BackingField")]
+        public static extern ref TimeSpan? NullableTimeSpan(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableTimeSpanArray>k__BackingField")]
+        public static extern ref TimeSpan?[] NullableTimeSpanArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt16>k__BackingField")]
+        public static extern ref ushort? NullableUInt16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt16Array>k__BackingField")]
+        public static extern ref ushort?[] NullableUInt16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt32>k__BackingField")]
+        public static extern ref uint? NullableUInt32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt32Array>k__BackingField")]
+        public static extern ref uint?[] NullableUInt32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt64>k__BackingField")]
+        public static extern ref ulong? NullableUInt64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt64Array>k__BackingField")]
+        public static extern ref ulong?[] NullableUInt64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt8>k__BackingField")]
+        public static extern ref byte? NullableUInt8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUInt8Array>k__BackingField")]
+        public static extern ref byte?[] NullableUInt8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUri>k__BackingField")]
+        public static extern ref Uri NullableUri(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<NullableUriArray>k__BackingField")]
+        public static extern ref Uri[] NullableUriArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<PhysicalAddress>k__BackingField")]
+        public static extern ref PhysicalAddress PhysicalAddress(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<PhysicalAddressArray>k__BackingField")]
+        public static extern ref PhysicalAddress[] PhysicalAddressArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<PhysicalAddressToBytesConverterProperty>k__BackingField")]
+        public static extern ref PhysicalAddress PhysicalAddressToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<PhysicalAddressToStringConverterProperty>k__BackingField")]
+        public static extern ref PhysicalAddress PhysicalAddressToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<String>k__BackingField")]
+        public static extern ref string String(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringArray>k__BackingField")]
+        public static extern ref string[] StringArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_stringReadOnlyCollection")]
+        public static extern ref List<string> _stringReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToBoolConverterProperty>k__BackingField")]
+        public static extern ref string StringToBoolConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToBytesConverterProperty>k__BackingField")]
+        public static extern ref string StringToBytesConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToCharConverterProperty>k__BackingField")]
+        public static extern ref string StringToCharConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDateOnlyConverterProperty>k__BackingField")]
+        public static extern ref string StringToDateOnlyConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDateTimeConverterProperty>k__BackingField")]
+        public static extern ref string StringToDateTimeConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDateTimeOffsetConverterProperty>k__BackingField")]
+        public static extern ref string StringToDateTimeOffsetConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDecimalNumberConverterProperty>k__BackingField")]
+        public static extern ref string StringToDecimalNumberConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToDoubleNumberConverterProperty>k__BackingField")]
+        public static extern ref string StringToDoubleNumberConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToEnumConverterProperty>k__BackingField")]
+        public static extern ref string StringToEnumConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToGuidConverterProperty>k__BackingField")]
+        public static extern ref string StringToGuidConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToIntNumberConverterProperty>k__BackingField")]
+        public static extern ref string StringToIntNumberConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToTimeOnlyConverterProperty>k__BackingField")]
+        public static extern ref string StringToTimeOnlyConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToTimeSpanConverterProperty>k__BackingField")]
+        public static extern ref string StringToTimeSpanConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<StringToUriConverterProperty>k__BackingField")]
+        public static extern ref string StringToUriConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeOnly>k__BackingField")]
+        public static extern ref TimeOnly TimeOnly(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeOnlyArray>k__BackingField")]
+        public static extern ref TimeOnly[] TimeOnlyArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeOnlyToStringConverterProperty>k__BackingField")]
+        public static extern ref TimeOnly TimeOnlyToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeOnlyToTicksConverterProperty>k__BackingField")]
+        public static extern ref TimeOnly TimeOnlyToTicksConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeSpan>k__BackingField")]
+        public static extern ref TimeSpan TimeSpan(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeSpanArray>k__BackingField")]
+        public static extern ref TimeSpan[] TimeSpanArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeSpanToStringConverterProperty>k__BackingField")]
+        public static extern ref TimeSpan TimeSpanToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<TimeSpanToTicksConverterProperty>k__BackingField")]
+        public static extern ref TimeSpan TimeSpanToTicksConverterProperty(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt16>k__BackingField")]
+        public static extern ref ushort UInt16(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt16Array>k__BackingField")]
+        public static extern ref ushort[] UInt16Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt32>k__BackingField")]
+        public static extern ref uint UInt32(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt32Array>k__BackingField")]
+        public static extern ref uint[] UInt32Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt64>k__BackingField")]
+        public static extern ref ulong UInt64(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt64Array>k__BackingField")]
+        public static extern ref ulong[] UInt64Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt8>k__BackingField")]
+        public static extern ref byte UInt8(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UInt8Array>k__BackingField")]
+        public static extern ref byte[] UInt8Array(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_uInt8ReadOnlyCollection")]
+        public static extern ref List<byte> _uInt8ReadOnlyCollection(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Uri>k__BackingField")]
+        public static extern ref Uri Uri(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UriArray>k__BackingField")]
+        public static extern ref Uri[] UriArray(CompiledModelTestBase.ManyTypes @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<UriToStringConverterProperty>k__BackingField")]
+        public static extern ref Uri UriToStringConverterProperty(CompiledModelTestBase.ManyTypes @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedType0EntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedType0EntityType.cs
new file mode 100644
index 00000000..570cd6e5
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedType0EntityType.cs
@@ -0,0 +1,944 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class OwnedType0EntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType",
+                typeof(CompiledModelTestBase.OwnedType),
+                baseEntityType,
+                sharedClrType: true,
+                propertyCount: 13,
+                servicePropertyCount: 1,
+                foreignKeyCount: 1,
+                keyCount: 1);
+
+            var principalDerivedId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedId",
+                typeof(long),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0L);
+            principalDerivedId.SetAccessors(
+                long (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<long>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<long>(0) == 0L ? entry.ReadTemporaryValue<long>(0) : entry.ReadShadowValue<long>(0))),
+                long (IInternalEntry entry) => entry.ReadShadowValue<long>(0),
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(principalDerivedId, 0),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(principalDerivedId, 0));
+            principalDerivedId.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: 0,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            principalDerivedId.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            principalDerivedId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(principalDerivedId));
+
+            var principalDerivedAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedAlternateId",
+                typeof(Guid),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            principalDerivedAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<Guid>(1) : (entry.FlaggedAsTemporary(1) && entry.ReadShadowValue<Guid>(1) == new Guid("00000000-0000-0000-0000-000000000000") ? entry.ReadTemporaryValue<Guid>(1) : entry.ReadShadowValue<Guid>(1))),
+                Guid (IInternalEntry entry) => entry.ReadShadowValue<Guid>(1),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(principalDerivedAlternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(principalDerivedAlternateId, 1));
+            principalDerivedAlternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: 1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            principalDerivedAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            principalDerivedAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(principalDerivedAlternateId));
+
+            var __synthesizedOrdinal = runtimeEntityType.AddProperty(
+                "__synthesizedOrdinal",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            __synthesizedOrdinal.SetAccessors(
+                int (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(2) ? entry.ReadStoreGeneratedValue<int>(2) : (entry.FlaggedAsTemporary(2) && entry.ReadShadowValue<int>(2) == 0 ? entry.ReadTemporaryValue<int>(2) : entry.ReadShadowValue<int>(2))),
+                int (IInternalEntry entry) => entry.ReadShadowValue<int>(2),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(__synthesizedOrdinal, 2),
+                int (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<int>(__synthesizedOrdinal, 2));
+            __synthesizedOrdinal.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: 2,
+                relationshipIndex: 2,
+                storeGenerationIndex: 2);
+            __synthesizedOrdinal.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+            __synthesizedOrdinal.SetCurrentValueComparer(new EntryCurrentValueComparer<int>(__synthesizedOrdinal));
+
+            var details = runtimeEntityType.AddProperty(
+                "Details",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            details.SetGetter(
+                string (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._details(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._details(instance) == null);
+            details.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                {
+                    OwnedTypeUnsafeAccessors._details(instance) = value;
+                    return instance;
+                });
+            details.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                {
+                    OwnedTypeUnsafeAccessors._details(instance) = value;
+                    return instance;
+                });
+            details.SetAccessors(
+                string (IInternalEntry entry) => OwnedTypeUnsafeAccessors._details(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                string (IInternalEntry entry) => OwnedTypeUnsafeAccessors._details(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(details, 3),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(details));
+            details.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            details.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var number = runtimeEntityType.AddProperty(
+                "Number",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0);
+            number.SetGetter(
+                int (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance) == 0);
+            number.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                {
+                    OwnedTypeUnsafeAccessors.Number(instance) = value;
+                    return instance;
+                });
+            number.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                {
+                    OwnedTypeUnsafeAccessors.Number(instance) = value;
+                    return instance;
+                });
+            number.SetAccessors(
+                int (IInternalEntry entry) => OwnedTypeUnsafeAccessors.Number(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                int (IInternalEntry entry) => OwnedTypeUnsafeAccessors.Number(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(number, 4),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(number));
+            number.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            number.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance) == null);
+            refTypeArray.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 5),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+            refTypeArray.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+            refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.SetGetter(
+                IEnumerable<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) == null);
+            refTypeEnumerable.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetAccessors(
+                IEnumerable<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 6),
+                IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+            refTypeEnumerable.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+            refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.SetGetter(
+                IList<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance) == null);
+            refTypeIList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetAccessors(
+                IList<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 7),
+                IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+            refTypeIList.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+            refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.SetGetter(
+                List<IPAddress> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance) == null);
+            refTypeList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetAccessors(
+                List<IPAddress> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 8),
+                List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+            refTypeList.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+            refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance) == null);
+            valueTypeArray.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 9),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+            valueTypeArray.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+            valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.SetGetter(
+                IEnumerable<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) == null);
+            valueTypeEnumerable.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetAccessors(
+                IEnumerable<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 10),
+                IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+            valueTypeEnumerable.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+            valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.SetGetter(
+                IList<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance) == null);
+            valueTypeIList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetAccessors(
+                IList<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 11),
+                IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+            valueTypeIList.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+            valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.SetGetter(
+                List<short> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance) == null);
+            valueTypeList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetAccessors(
+                List<short> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<short> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 12),
+                List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+            valueTypeList.SetPropertyIndexes(
+                index: 12,
+                originalValueIndex: 12,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+            valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+            var context = runtimeEntityType.AddServiceProperty(
+                "Context",
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Context", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                serviceType: typeof(DbContext));
+            context.SetPropertyIndexes(
+                index: -1,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalDerivedId, principalDerivedAlternateId, __synthesizedOrdinal });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalDerivedId"), declaringEntityType.FindProperty("PrincipalDerivedAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true,
+                ownership: true);
+
+            var manyOwned = principalEntityType.AddNavigation("ManyOwned",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(IList<CompiledModelTestBase.OwnedType>),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("ManyOwned", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            manyOwned.SetGetter(
+                IList<CompiledModelTestBase.OwnedType> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance),
+                bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance) == null);
+            manyOwned.SetSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, IList<CompiledModelTestBase.OwnedType> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance) = value;
+                    return instance;
+                });
+            manyOwned.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, IList<CompiledModelTestBase.OwnedType> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance) = value;
+                    return instance;
+                });
+            manyOwned.SetAccessors(
+                IList<CompiledModelTestBase.OwnedType> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                IList<CompiledModelTestBase.OwnedType> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                null,
+                IList<CompiledModelTestBase.OwnedType> (IInternalEntry entry) => entry.GetCurrentValue<IList<CompiledModelTestBase.OwnedType>>(manyOwned));
+            manyOwned.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 5,
+                storeGenerationIndex: -1);
+            manyOwned.SetCollectionAccessor<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, IList<CompiledModelTestBase.OwnedType>, CompiledModelTestBase.OwnedType>(
+                IList<CompiledModelTestBase.OwnedType> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IList<CompiledModelTestBase.OwnedType> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) = ((IList<CompiledModelTestBase.OwnedType>)collection),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IList<CompiledModelTestBase.OwnedType> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) = ((IList<CompiledModelTestBase.OwnedType>)collection),
+                IList<CompiledModelTestBase.OwnedType> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, Action<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, IList<CompiledModelTestBase.OwnedType>> setter) => ClrCollectionAccessorFactory.CreateAndSet<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, IList<CompiledModelTestBase.OwnedType>, List<CompiledModelTestBase.OwnedType>>(entity, setter),
+                IList<CompiledModelTestBase.OwnedType> () => new List<CompiledModelTestBase.OwnedType>());
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var principalDerivedId = runtimeEntityType.FindProperty("PrincipalDerivedId");
+            var principalDerivedAlternateId = runtimeEntityType.FindProperty("PrincipalDerivedAlternateId");
+            var __synthesizedOrdinal = runtimeEntityType.FindProperty("__synthesizedOrdinal");
+            var details = runtimeEntityType.FindProperty("Details");
+            var number = runtimeEntityType.FindProperty("Number");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var key = runtimeEntityType.FindKey(new[] { principalDerivedId, principalDerivedAlternateId, __synthesizedOrdinal });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.OwnedType)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, int, string, int, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>(((ValueComparer<long>)(((IProperty)principalDerivedId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalDerivedId)), ((ValueComparer<Guid>)(((IProperty)principalDerivedAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalDerivedAlternateId)), ((ValueComparer<int>)(((IProperty)__synthesizedOrdinal).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(__synthesizedOrdinal)), (source.GetCurrentValue<string>(details) == null ? null : ((ValueComparer<string>)(((IProperty)details).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(details))), ((ValueComparer<int>)(((IProperty)number).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(number)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, int>(((ValueComparer<long>)(((IProperty)principalDerivedId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalDerivedAlternateId).GetValueComparer())).Snapshot(default(Guid)), ((ValueComparer<int>)(((IProperty)__synthesizedOrdinal).GetValueComparer())).Snapshot(default(int))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid, int>(default(long), default(Guid), default(int)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long, Guid, int>((source.ContainsKey("PrincipalDerivedId") ? ((long)(source["PrincipalDerivedId"])) : 0L), (source.ContainsKey("PrincipalDerivedAlternateId") ? ((Guid)(source["PrincipalDerivedAlternateId"])) : new Guid("00000000-0000-0000-0000-000000000000")), (source.ContainsKey("__synthesizedOrdinal") ? ((int)(source["__synthesizedOrdinal"])) : 0)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, int>(default(long), default(Guid), default(int)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.OwnedType)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, int>(((ValueComparer<long>)(((IProperty)principalDerivedId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalDerivedId)), ((ValueComparer<Guid>)(((IProperty)principalDerivedAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalDerivedAlternateId)), ((ValueComparer<int>)(((IProperty)__synthesizedOrdinal).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<int>(__synthesizedOrdinal)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 13,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 13,
+                shadowCount: 3,
+                relationshipCount: 3,
+                storeGeneratedCount: 3));
+            runtimeEntityType.AddAnnotation("Relational:ContainerColumnName", "ManyOwned");
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeEntityType.cs
new file mode 100644
index 00000000..d462750b
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeEntityType.cs
@@ -0,0 +1,922 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class OwnedTypeEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                typeof(CompiledModelTestBase.OwnedType),
+                baseEntityType,
+                sharedClrType: true,
+                changeTrackingStrategy: ChangeTrackingStrategy.ChangingAndChangedNotificationsWithOriginalValues,
+                propertyCount: 12,
+                servicePropertyCount: 1,
+                foreignKeyCount: 1,
+                keyCount: 1);
+
+            var principalBaseId = runtimeEntityType.AddProperty(
+                "PrincipalBaseId",
+                typeof(long),
+                propertyAccessMode: PropertyAccessMode.Field,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0L);
+            principalBaseId.SetAccessors(
+                long (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<long>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<long>(0) == 0L ? entry.ReadTemporaryValue<long>(0) : entry.ReadShadowValue<long>(0))),
+                long (IInternalEntry entry) => entry.ReadShadowValue<long>(0),
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(principalBaseId, 0),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(principalBaseId, 0));
+            principalBaseId.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: 0,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            principalBaseId.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            principalBaseId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(principalBaseId));
+
+            var principalBaseAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalBaseAlternateId",
+                typeof(Guid),
+                propertyAccessMode: PropertyAccessMode.Field,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            principalBaseAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<Guid>(1) : (entry.FlaggedAsTemporary(1) && entry.ReadShadowValue<Guid>(1) == new Guid("00000000-0000-0000-0000-000000000000") ? entry.ReadTemporaryValue<Guid>(1) : entry.ReadShadowValue<Guid>(1))),
+                Guid (IInternalEntry entry) => entry.ReadShadowValue<Guid>(1),
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(principalBaseAlternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(principalBaseAlternateId, 1));
+            principalBaseAlternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: 1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            principalBaseAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            principalBaseAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(principalBaseAlternateId));
+
+            var details = runtimeEntityType.AddProperty(
+                "Details",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            details.SetGetter(
+                string (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._details(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._details(instance) == null);
+            details.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                {
+                    OwnedTypeUnsafeAccessors._details(instance) = value;
+                    return instance;
+                });
+            details.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                {
+                    OwnedTypeUnsafeAccessors._details(instance) = value;
+                    return instance;
+                });
+            details.SetAccessors(
+                string (IInternalEntry entry) => OwnedTypeUnsafeAccessors._details(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                string (IInternalEntry entry) => OwnedTypeUnsafeAccessors._details(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(details, 2),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(details));
+            details.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            details.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var number = runtimeEntityType.AddProperty(
+                "Number",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                sentinel: 0);
+            number.SetGetter(
+                int (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance) == 0);
+            number.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                {
+                    OwnedTypeUnsafeAccessors.Number(instance) = value;
+                    return instance;
+                });
+            number.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                {
+                    OwnedTypeUnsafeAccessors.Number(instance) = value;
+                    return instance;
+                });
+            number.SetAccessors(
+                int (IInternalEntry entry) => OwnedTypeUnsafeAccessors.Number(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                int (IInternalEntry entry) => OwnedTypeUnsafeAccessors.Number(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(number, 3),
+                int (IInternalEntry entry) => entry.GetCurrentValue<int>(number));
+            number.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            number.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance) == null);
+            refTypeArray.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 4),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+            refTypeArray.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+            refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeEnumerable.SetGetter(
+                IEnumerable<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) == null);
+            refTypeEnumerable.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetAccessors(
+                IEnumerable<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 5),
+                IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+            refTypeEnumerable.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+            refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeIList.SetGetter(
+                IList<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance) == null);
+            refTypeIList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetAccessors(
+                IList<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 6),
+                IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+            refTypeIList.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+            refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeList.SetGetter(
+                List<IPAddress> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance) == null);
+            refTypeList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetAccessors(
+                List<IPAddress> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._refTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 7),
+                List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+            refTypeList.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+            refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance) == null);
+            valueTypeArray.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeArray(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 8),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+            valueTypeArray.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+            valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeEnumerable.SetGetter(
+                IEnumerable<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) == null);
+            valueTypeEnumerable.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetAccessors(
+                IEnumerable<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 9),
+                IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+            valueTypeEnumerable.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+            valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeIList.SetGetter(
+                IList<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance) == null);
+            valueTypeIList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                {
+                    OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetAccessors(
+                IList<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => OwnedTypeUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 10),
+                IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+            valueTypeIList.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+            valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeList.SetGetter(
+                List<short> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance),
+                bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance) == null);
+            valueTypeList.SetSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                {
+                    OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetAccessors(
+                List<short> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<short> (IInternalEntry entry) => OwnedTypeUnsafeAccessors._valueTypeList(((CompiledModelTestBase.OwnedType)(entry.Entity))),
+                List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 11),
+                List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+            valueTypeList.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+            valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+            var context = runtimeEntityType.AddServiceProperty(
+                "Context",
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Context", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                serviceType: typeof(DbContext));
+            context.SetPropertyIndexes(
+                index: -1,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalBaseId, principalBaseAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId"), declaringEntityType.FindProperty("PrincipalBaseAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                requiredDependent: true,
+                ownership: true);
+
+            var owned = principalEntityType.AddNavigation("Owned",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.OwnedType),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Owned", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("_ownedField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                eagerLoaded: true);
+
+            owned.SetGetter(
+                CompiledModelTestBase.OwnedType (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors._ownedField(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors._ownedField(instance) == null);
+            owned.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.OwnedType value) =>
+                {
+                    PrincipalBaseUnsafeAccessors._ownedField(instance) = value;
+                    return instance;
+                });
+            owned.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.OwnedType value) =>
+                {
+                    PrincipalBaseUnsafeAccessors._ownedField(instance) = value;
+                    return instance;
+                });
+            owned.SetAccessors(
+                CompiledModelTestBase.OwnedType (IInternalEntry entry) => PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.OwnedType (IInternalEntry entry) => PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                null,
+                CompiledModelTestBase.OwnedType (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.OwnedType>(owned));
+            owned.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 2,
+                storeGenerationIndex: -1);
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var principalBaseId = runtimeEntityType.FindProperty("PrincipalBaseId");
+            var principalBaseAlternateId = runtimeEntityType.FindProperty("PrincipalBaseAlternateId");
+            var details = runtimeEntityType.FindProperty("Details");
+            var number = runtimeEntityType.FindProperty("Number");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var key = runtimeEntityType.FindKey(new[] { principalBaseId, principalBaseAlternateId });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.OwnedType)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, string, int, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>(((ValueComparer<long>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalBaseId)), ((ValueComparer<Guid>)(((IProperty)principalBaseAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalBaseAlternateId)), (source.GetCurrentValue<string>(details) == null ? null : ((ValueComparer<string>)(((IProperty)details).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(details))), ((ValueComparer<int>)(((IProperty)number).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(number)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid>(((ValueComparer<long>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalBaseAlternateId).GetValueComparer())).Snapshot(default(Guid))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid>(default(long), default(Guid)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long, Guid>((source.ContainsKey("PrincipalBaseId") ? ((long)(source["PrincipalBaseId"])) : 0L), (source.ContainsKey("PrincipalBaseAlternateId") ? ((Guid)(source["PrincipalBaseAlternateId"])) : new Guid("00000000-0000-0000-0000-000000000000"))))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid>(default(long), default(Guid)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.OwnedType)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid>(((ValueComparer<long>)(((IProperty)principalBaseId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalBaseId)), ((ValueComparer<Guid>)(((IProperty)principalBaseAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalBaseAlternateId)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 12,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 12,
+                shadowCount: 2,
+                relationshipCount: 2,
+                storeGeneratedCount: 2));
+            runtimeEntityType.AddAnnotation("Relational:ContainerColumnName", "Owned");
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeUnsafeAccessors.cs
new file mode 100644
index 00000000..ed8d21e3
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeUnsafeAccessors.cs
@@ -0,0 +1,45 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class OwnedTypeUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_details")]
+        public static extern ref string _details(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Number>k__BackingField")]
+        public static extern ref int Number(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeArray")]
+        public static extern ref IPAddress[] _refTypeArray(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeEnumerable")]
+        public static extern ref IEnumerable<string> _refTypeEnumerable(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeIList")]
+        public static extern ref IList<string> _refTypeIList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeList")]
+        public static extern ref List<IPAddress> _refTypeList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_valueTypeArray")]
+        public static extern ref DateTime[] _valueTypeArray(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_valueTypeEnumerable")]
+        public static extern ref IEnumerable<byte> _valueTypeEnumerable(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeIList>k__BackingField")]
+        public static extern ref IList<byte> ValueTypeIList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_valueTypeList")]
+        public static extern ref List<short> _valueTypeList(CompiledModelTestBase.OwnedType @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseEntityType.cs
new file mode 100644
index 00000000..eb7ad21d
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseEntityType.cs
@@ -0,0 +1,1121 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.ValueGeneration;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                typeof(CompiledModelTestBase.PrincipalBase),
+                baseEntityType,
+                discriminatorProperty: "Discriminator",
+                discriminatorValue: "PrincipalBase",
+                derivedTypesCount: 1,
+                propertyCount: 15,
+                navigationCount: 1,
+                skipNavigationCount: 1,
+                unnamedIndexCount: 1,
+                keyCount: 2);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            id.SetGetter(
+                long? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Id(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Id(instance).HasValue));
+            id.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                long? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                long? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(id, 0),
+                long? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long?>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: -1);
+            id.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<long?>(id));
+            id.SetComparer(new NullableValueComparer<long>(id.TypeMapping.Comparer));
+            id.SetKeyComparer(new NullableValueComparer<long>(id.TypeMapping.KeyComparer));
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+            var alternateId = runtimeEntityType.AddProperty(
+                "AlternateId",
+                typeof(Guid),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("AlternateId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.FieldDuringConstruction,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"),
+                jsonValueReaderWriter: new CompiledModelTestBase.MyJsonGuidReaderWriter());
+            alternateId.SetGetter(
+                Guid (CompiledModelTestBase.PrincipalBase instance) => instance.AlternateId,
+                bool (CompiledModelTestBase.PrincipalBase instance) => instance.AlternateId == new Guid("00000000-0000-0000-0000-000000000000"));
+            alternateId.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, Guid value) =>
+                {
+                    instance.AlternateId = value;
+                    return instance;
+                });
+            alternateId.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, Guid value) =>
+                {
+                    instance.AlternateId = value;
+                    return instance;
+                });
+            alternateId.SetAccessors(
+                Guid (IInternalEntry entry) => ((CompiledModelTestBase.PrincipalBase)(entry.Entity)).AlternateId,
+                Guid (IInternalEntry entry) => ((CompiledModelTestBase.PrincipalBase)(entry.Entity)).AlternateId,
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(alternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(alternateId, 1));
+            alternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: 1,
+                storeGenerationIndex: -1);
+            alternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            alternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(alternateId));
+
+            var discriminator = runtimeEntityType.AddProperty(
+                "Discriminator",
+                typeof(string),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 55,
+                valueGeneratorFactory: new DiscriminatorValueGeneratorFactory().Create);
+            discriminator.SetAccessors(
+                string (IInternalEntry entry) => entry.ReadShadowValue<string>(0),
+                string (IInternalEntry entry) => entry.ReadShadowValue<string>(0),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(discriminator, 2),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(discriminator));
+            discriminator.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: 0,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            discriminator.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(55)",
+                    size: 55));
+
+            var enum1 = runtimeEntityType.AddProperty(
+                "Enum1",
+                typeof(CompiledModelTestBase.AnEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum1.SetGetter(
+                CompiledModelTestBase.AnEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum1(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.Enum1(instance))), ((object)((CompiledModelTestBase.AnEnum)0L))));
+            enum1.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                    return instance;
+                });
+            enum1.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                    return instance;
+                });
+            enum1.SetAccessors(
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum>(enum1, 3),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1));
+            enum1.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                    CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                        CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+            enum1.SetSentinelFromProviderValue(0);
+
+            var enum2 = runtimeEntityType.AddProperty(
+                "Enum2",
+                typeof(CompiledModelTestBase.AnEnum?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            enum2.SetGetter(
+                CompiledModelTestBase.AnEnum? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum2(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Enum2(instance).HasValue));
+            enum2.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                    return instance;
+                });
+            enum2.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                    return instance;
+                });
+            enum2.SetAccessors(
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum?>(enum2, 4),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2));
+            enum2.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                    CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                        CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+            enum2.SetComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.Comparer));
+            enum2.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.KeyComparer));
+
+            var flagsEnum1 = runtimeEntityType.AddProperty(
+                "FlagsEnum1",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum1.SetGetter(
+                CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum1(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum1(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+            flagsEnum1.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                    return instance;
+                });
+            flagsEnum1.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                    return instance;
+                });
+            flagsEnum1.SetAccessors(
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1, 5),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1));
+            flagsEnum1.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            flagsEnum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                    CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                        CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+            flagsEnum1.SetSentinelFromProviderValue(0);
+
+            var flagsEnum2 = runtimeEntityType.AddProperty(
+                "FlagsEnum2",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Property);
+            flagsEnum2.SetGetter(
+                CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Get_FlagsEnum2(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.Get_FlagsEnum2(instance))), ((object)(CompiledModelTestBase.AFlagsEnum.B | CompiledModelTestBase.AFlagsEnum.C))));
+            flagsEnum2.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Set_FlagsEnum2(instance, value);
+                    return instance;
+                });
+            flagsEnum2.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Set_FlagsEnum2(instance, value);
+                    return instance;
+                });
+            flagsEnum2.SetAccessors(
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Get_FlagsEnum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Get_FlagsEnum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2, 6),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2));
+            flagsEnum2.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            flagsEnum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                    CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                        CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+            flagsEnum2.SetSentinelFromProviderValue(6);
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance) == null);
+            refTypeArray.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 7),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+            refTypeArray.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+            refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.SetGetter(
+                IEnumerable<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) == null);
+            refTypeEnumerable.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetAccessors(
+                IEnumerable<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 8),
+                IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+            refTypeEnumerable.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+            refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.SetGetter(
+                IList<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance) == null);
+            refTypeIList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetAccessors(
+                IList<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 9),
+                IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+            refTypeIList.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+            refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.SetGetter(
+                List<IPAddress> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance) == null);
+            refTypeList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetAccessors(
+                List<IPAddress> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 10),
+                List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+            refTypeList.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+            refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) == null);
+            valueTypeArray.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 11),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+            valueTypeArray.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+            valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.SetGetter(
+                IEnumerable<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) == null);
+            valueTypeEnumerable.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetAccessors(
+                IEnumerable<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 12),
+                IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+            valueTypeEnumerable.SetPropertyIndexes(
+                index: 12,
+                originalValueIndex: 12,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+            valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.SetGetter(
+                IList<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) == null);
+            valueTypeIList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetAccessors(
+                IList<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 13),
+                IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+            valueTypeIList.SetPropertyIndexes(
+                index: 13,
+                originalValueIndex: 13,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+            valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.SetGetter(
+                List<short> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance) == null);
+            valueTypeList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetAccessors(
+                List<short> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<short> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 14),
+                List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+            valueTypeList.SetPropertyIndexes(
+                index: 14,
+                originalValueIndex: 14,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+            valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { id, alternateId });
+            runtimeEntityType.SetPrimaryKey(key0);
+            key0.AddAnnotation("Relational:Name", "PK");
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { alternateId, id });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeSkipNavigation CreateSkipNavigation1(RuntimeEntityType declaringEntityType, RuntimeEntityType targetEntityType, RuntimeEntityType joinEntityType)
+        {
+            var skipNavigation = declaringEntityType.AddSkipNavigation(
+                "Deriveds",
+                targetEntityType,
+                joinEntityType.FindForeignKey(
+                    new[] { joinEntityType.FindProperty("PrincipalsId"), joinEntityType.FindProperty("PrincipalsAlternateId") },
+                    declaringEntityType.FindKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") }),
+                    declaringEntityType),
+                true,
+                false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Deriveds", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Deriveds>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var inverse = targetEntityType.FindSkipNavigation("Principals");
+            if (inverse != null)
+            {
+                skipNavigation.Inverse = inverse;
+                inverse.Inverse = skipNavigation;
+            }
+
+            skipNavigation.SetGetter(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Deriveds(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Deriveds(instance) == null);
+            skipNavigation.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Deriveds(instance) = value;
+                    return instance;
+                });
+            skipNavigation.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Deriveds(instance) = value;
+                    return instance;
+                });
+            skipNavigation.SetAccessors(
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Deriveds(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Deriveds(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                null,
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => entry.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(skipNavigation));
+            skipNavigation.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 3,
+                storeGenerationIndex: -1);
+            skipNavigation.SetCollectionAccessor<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase entity) => PrincipalBaseUnsafeAccessors.Deriveds(entity),
+                (CompiledModelTestBase.PrincipalBase entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalBaseUnsafeAccessors.Deriveds(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                (CompiledModelTestBase.PrincipalBase entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalBaseUnsafeAccessors.Deriveds(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase entity, Action<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>> setter) => ClrCollectionAccessorFactory.CreateAndSetHashSet<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(entity, setter),
+                ICollection<CompiledModelTestBase.PrincipalBase> () => ((ICollection<CompiledModelTestBase.PrincipalBase>)(((ICollection<CompiledModelTestBase.PrincipalBase>)(new HashSet<CompiledModelTestBase.PrincipalBase>(ReferenceEqualityComparer.Instance))))));
+            return skipNavigation;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var alternateId = runtimeEntityType.FindProperty("AlternateId");
+            var discriminator = runtimeEntityType.FindProperty("Discriminator");
+            var enum1 = runtimeEntityType.FindProperty("Enum1");
+            var enum2 = runtimeEntityType.FindProperty("Enum2");
+            var flagsEnum1 = runtimeEntityType.FindProperty("FlagsEnum1");
+            var flagsEnum2 = runtimeEntityType.FindProperty("FlagsEnum2");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNullableFactory<long?, long>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<long?>(key));
+            var key0 = runtimeEntityType.FindKey(new[] { id, alternateId });
+            key0.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key0));
+            key0.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key0));
+            var owned = runtimeEntityType.FindNavigation("Owned");
+            var deriveds = runtimeEntityType.FindSkipNavigation("Deriveds");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.PrincipalBase)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, Guid, string, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum, CompiledModelTestBase.AFlagsEnum, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), (source.GetCurrentValue<string>(discriminator) == null ? null : ((ValueComparer<string>)(((IProperty)discriminator).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(discriminator))), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1)), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => Snapshot.Empty);
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<string>((source.ContainsKey("Discriminator") ? ((string)(source["Discriminator"])) : null)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<string>(default(string)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.PrincipalBase)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, Guid, object, object>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), source.GetCurrentValue<CompiledModelTestBase.OwnedType>(owned), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 15,
+                navigationCount: 2,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 15,
+                shadowCount: 1,
+                relationshipCount: 4,
+                storeGeneratedCount: 0));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPH");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs
new file mode 100644
index 00000000..f5374fc4
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs
@@ -0,0 +1,454 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalBasePrincipalDerivedDependentBasebyteEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                typeof(Dictionary<string, object>),
+                baseEntityType,
+                sharedClrType: true,
+                indexerPropertyInfo: RuntimeEntityType.FindIndexerProperty(typeof(Dictionary<string, object>)),
+                propertyBag: true,
+                propertyCount: 5,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var derivedsId = runtimeEntityType.AddProperty(
+                "DerivedsId",
+                typeof(long),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            derivedsId.SetGetter(
+                long (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("DerivedsId") ? instance["DerivedsId"] : null) == null ? 0L : ((long)((((IDictionary<string, object>)instance).ContainsKey("DerivedsId") ? instance["DerivedsId"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("DerivedsId") ? instance["DerivedsId"] : null) == null);
+            derivedsId.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
+                {
+                    instance["DerivedsId"] = ((object)value);
+                    return instance;
+                });
+            derivedsId.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
+                {
+                    instance["DerivedsId"] = ((object)value);
+                    return instance;
+                });
+            derivedsId.SetAccessors(
+                long (IInternalEntry entry) =>
+                {
+                    if (entry.FlaggedAsStoreGenerated(0))
+                    {
+                        return entry.ReadStoreGeneratedValue<long>(0);
+                    }
+                    else
+                    {
+                        {
+                            if (entry.FlaggedAsTemporary(0) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsId"] : null) == null)
+                            {
+                                return entry.ReadTemporaryValue<long>(0);
+                            }
+                            else
+                            {
+                                var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsId"] : null);
+                                return (nullableValue == null ? default(long) : ((long)nullableValue));
+                            }
+                        }
+                    }
+                },
+                long (IInternalEntry entry) =>
+                {
+                    var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsId"] : null);
+                    return (nullableValue == null ? default(long) : ((long)nullableValue));
+                },
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(derivedsId, 0),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(derivedsId, 0));
+            derivedsId.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            derivedsId.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            derivedsId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(derivedsId));
+
+            var derivedsAlternateId = runtimeEntityType.AddProperty(
+                "DerivedsAlternateId",
+                typeof(Guid),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            derivedsAlternateId.SetGetter(
+                Guid (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("DerivedsAlternateId") ? instance["DerivedsAlternateId"] : null) == null ? new Guid("00000000-0000-0000-0000-000000000000") : ((Guid)((((IDictionary<string, object>)instance).ContainsKey("DerivedsAlternateId") ? instance["DerivedsAlternateId"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("DerivedsAlternateId") ? instance["DerivedsAlternateId"] : null) == null);
+            derivedsAlternateId.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
+                {
+                    instance["DerivedsAlternateId"] = ((object)value);
+                    return instance;
+                });
+            derivedsAlternateId.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
+                {
+                    instance["DerivedsAlternateId"] = ((object)value);
+                    return instance;
+                });
+            derivedsAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) =>
+                {
+                    if (entry.FlaggedAsStoreGenerated(1))
+                    {
+                        return entry.ReadStoreGeneratedValue<Guid>(1);
+                    }
+                    else
+                    {
+                        {
+                            if (entry.FlaggedAsTemporary(1) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsAlternateId"] : null) == null)
+                            {
+                                return entry.ReadTemporaryValue<Guid>(1);
+                            }
+                            else
+                            {
+                                var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsAlternateId"] : null);
+                                return (nullableValue == null ? default(Guid) : ((Guid)nullableValue));
+                            }
+                        }
+                    }
+                },
+                Guid (IInternalEntry entry) =>
+                {
+                    var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("DerivedsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["DerivedsAlternateId"] : null);
+                    return (nullableValue == null ? default(Guid) : ((Guid)nullableValue));
+                },
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(derivedsAlternateId, 1),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(derivedsAlternateId, 1));
+            derivedsAlternateId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            derivedsAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            derivedsAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(derivedsAlternateId));
+
+            var principalsId = runtimeEntityType.AddProperty(
+                "PrincipalsId",
+                typeof(long),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            principalsId.SetGetter(
+                long (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("PrincipalsId") ? instance["PrincipalsId"] : null) == null ? 0L : ((long)((((IDictionary<string, object>)instance).ContainsKey("PrincipalsId") ? instance["PrincipalsId"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("PrincipalsId") ? instance["PrincipalsId"] : null) == null);
+            principalsId.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
+                {
+                    instance["PrincipalsId"] = ((object)value);
+                    return instance;
+                });
+            principalsId.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
+                {
+                    instance["PrincipalsId"] = ((object)value);
+                    return instance;
+                });
+            principalsId.SetAccessors(
+                long (IInternalEntry entry) =>
+                {
+                    if (entry.FlaggedAsStoreGenerated(2))
+                    {
+                        return entry.ReadStoreGeneratedValue<long>(2);
+                    }
+                    else
+                    {
+                        {
+                            if (entry.FlaggedAsTemporary(2) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsId"] : null) == null)
+                            {
+                                return entry.ReadTemporaryValue<long>(2);
+                            }
+                            else
+                            {
+                                var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsId"] : null);
+                                return (nullableValue == null ? default(long) : ((long)nullableValue));
+                            }
+                        }
+                    }
+                },
+                long (IInternalEntry entry) =>
+                {
+                    var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsId"] : null);
+                    return (nullableValue == null ? default(long) : ((long)nullableValue));
+                },
+                long (IInternalEntry entry) => entry.ReadOriginalValue<long>(principalsId, 2),
+                long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(principalsId, 2));
+            principalsId.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: -1,
+                relationshipIndex: 2,
+                storeGenerationIndex: 2);
+            principalsId.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            principalsId.SetCurrentValueComparer(new EntryCurrentValueComparer<long>(principalsId));
+
+            var principalsAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalsAlternateId",
+                typeof(Guid),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            principalsAlternateId.SetGetter(
+                Guid (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("PrincipalsAlternateId") ? instance["PrincipalsAlternateId"] : null) == null ? new Guid("00000000-0000-0000-0000-000000000000") : ((Guid)((((IDictionary<string, object>)instance).ContainsKey("PrincipalsAlternateId") ? instance["PrincipalsAlternateId"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("PrincipalsAlternateId") ? instance["PrincipalsAlternateId"] : null) == null);
+            principalsAlternateId.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
+                {
+                    instance["PrincipalsAlternateId"] = ((object)value);
+                    return instance;
+                });
+            principalsAlternateId.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
+                {
+                    instance["PrincipalsAlternateId"] = ((object)value);
+                    return instance;
+                });
+            principalsAlternateId.SetAccessors(
+                Guid (IInternalEntry entry) =>
+                {
+                    if (entry.FlaggedAsStoreGenerated(3))
+                    {
+                        return entry.ReadStoreGeneratedValue<Guid>(3);
+                    }
+                    else
+                    {
+                        {
+                            if (entry.FlaggedAsTemporary(3) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsAlternateId"] : null) == null)
+                            {
+                                return entry.ReadTemporaryValue<Guid>(3);
+                            }
+                            else
+                            {
+                                var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsAlternateId"] : null);
+                                return (nullableValue == null ? default(Guid) : ((Guid)nullableValue));
+                            }
+                        }
+                    }
+                },
+                Guid (IInternalEntry entry) =>
+                {
+                    var nullableValue = (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("PrincipalsAlternateId") ? ((Dictionary<string, object>)(entry.Entity))["PrincipalsAlternateId"] : null);
+                    return (nullableValue == null ? default(Guid) : ((Guid)nullableValue));
+                },
+                Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(principalsAlternateId, 3),
+                Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(principalsAlternateId, 3));
+            principalsAlternateId.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: 3,
+                storeGenerationIndex: 3);
+            principalsAlternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            principalsAlternateId.SetCurrentValueComparer(new EntryCurrentValueComparer<Guid>(principalsAlternateId));
+
+            var rowid = runtimeEntityType.AddProperty(
+                "rowid",
+                typeof(byte[]),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                nullable: true,
+                concurrencyToken: true,
+                valueGenerated: ValueGenerated.OnAddOrUpdate,
+                beforeSaveBehavior: PropertySaveBehavior.Ignore,
+                afterSaveBehavior: PropertySaveBehavior.Ignore);
+            rowid.SetGetter(
+                byte[] (Dictionary<string, object> instance) => ((((IDictionary<string, object>)instance).ContainsKey("rowid") ? instance["rowid"] : null) == null ? null : ((byte[])((((IDictionary<string, object>)instance).ContainsKey("rowid") ? instance["rowid"] : null)))),
+                bool (Dictionary<string, object> instance) => (((IDictionary<string, object>)instance).ContainsKey("rowid") ? instance["rowid"] : null) == null);
+            rowid.SetSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, byte[] value) =>
+                {
+                    instance["rowid"] = ((object)value);
+                    return instance;
+                });
+            rowid.SetMaterializationSetter(
+                Dictionary<string, object> (Dictionary<string, object> instance, byte[] value) =>
+                {
+                    instance["rowid"] = ((object)value);
+                    return instance;
+                });
+            rowid.SetAccessors(
+                byte[] (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(4) ? entry.ReadStoreGeneratedValue<byte[]>(4) : (entry.FlaggedAsTemporary(4) && (((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("rowid") ? ((Dictionary<string, object>)(entry.Entity))["rowid"] : null) == null ? entry.ReadTemporaryValue<byte[]>(4) : ((byte[])((((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("rowid") ? ((Dictionary<string, object>)(entry.Entity))["rowid"] : null))))),
+                byte[] (IInternalEntry entry) => ((byte[])((((IDictionary<string, object>)((Dictionary<string, object>)(entry.Entity))).ContainsKey("rowid") ? ((Dictionary<string, object>)(entry.Entity))["rowid"] : null))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(rowid, 4),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(rowid));
+            rowid.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: 4);
+            rowid.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(v1, v2),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(v),
+                    byte[] (byte[] v) => v.ToArray()),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(8)",
+                    size: 8));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { derivedsId, derivedsAlternateId, principalsId, principalsAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalsId, principalsAlternateId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DerivedsId"), declaringEntityType.FindProperty("DerivedsAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalsId"), declaringEntityType.FindProperty("PrincipalsAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.ClientCascade,
+                required: true);
+
+            runtimeForeignKey.AddAnnotation("Relational:Name", "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Princip~1");
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var derivedsId = runtimeEntityType.FindProperty("DerivedsId");
+            var derivedsAlternateId = runtimeEntityType.FindProperty("DerivedsAlternateId");
+            var principalsId = runtimeEntityType.FindProperty("PrincipalsId");
+            var principalsAlternateId = runtimeEntityType.FindProperty("PrincipalsAlternateId");
+            var rowid = runtimeEntityType.FindProperty("rowid");
+            var key = runtimeEntityType.FindKey(new[] { derivedsId, derivedsAlternateId, principalsId, principalsAlternateId });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateCompositeFactory(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<IReadOnlyList<object>>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((Dictionary<string, object>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, long, Guid, byte[]>(((ValueComparer<long>)(((IProperty)derivedsId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(derivedsId)), ((ValueComparer<Guid>)(((IProperty)derivedsAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(derivedsAlternateId)), ((ValueComparer<long>)(((IProperty)principalsId).GetValueComparer())).Snapshot(source.GetCurrentValue<long>(principalsId)), ((ValueComparer<Guid>)(((IProperty)principalsAlternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalsAlternateId)), (source.GetCurrentValue<byte[]>(rowid) == null ? null : ((ValueComparer<byte[]>)(((IProperty)rowid).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(rowid))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long, Guid, long, Guid, byte[]>(((ValueComparer<long>)(((IProperty)derivedsId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)derivedsAlternateId).GetValueComparer())).Snapshot(default(Guid)), ((ValueComparer<long>)(((IProperty)principalsId).GetValueComparer())).Snapshot(default(long)), ((ValueComparer<Guid>)(((IProperty)principalsAlternateId).GetValueComparer())).Snapshot(default(Guid)), (default(byte[]) == null ? null : ((ValueComparer<byte[]>)(((IProperty)rowid).GetValueComparer())).Snapshot(default(byte[])))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long, Guid, long, Guid, byte[]>(default(long), default(Guid), default(long), default(Guid), default(byte[])))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => Snapshot.Empty);
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((Dictionary<string, object>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long, Guid, long, Guid>(((ValueComparer<long>)(((IProperty)derivedsId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(derivedsId)), ((ValueComparer<Guid>)(((IProperty)derivedsAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(derivedsAlternateId)), ((ValueComparer<long>)(((IProperty)principalsId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long>(principalsId)), ((ValueComparer<Guid>)(((IProperty)principalsAlternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(principalsAlternateId)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 5,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 5,
+                shadowCount: 0,
+                relationshipCount: 4,
+                storeGeneratedCount: 5));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBasePrincipalDerived<DependentBase<byte?>>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseUnsafeAccessors.cs
new file mode 100644
index 00000000..4b43c6dd
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseUnsafeAccessors.cs
@@ -0,0 +1,63 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class PrincipalBaseUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref long? Id(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum1>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AnEnum Enum1(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum2>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AnEnum? Enum2(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<FlagsEnum1>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AFlagsEnum FlagsEnum1(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "get_FlagsEnum2")]
+        public static extern CompiledModelTestBase.AFlagsEnum Get_FlagsEnum2(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "set_FlagsEnum2")]
+        public static extern void Set_FlagsEnum2(CompiledModelTestBase.PrincipalBase @this, CompiledModelTestBase.AFlagsEnum value);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeArray>k__BackingField")]
+        public static extern ref IPAddress[] RefTypeArray(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeEnumerable>k__BackingField")]
+        public static extern ref IEnumerable<string> RefTypeEnumerable(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeIList>k__BackingField")]
+        public static extern ref IList<string> RefTypeIList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeList>k__BackingField")]
+        public static extern ref List<IPAddress> RefTypeList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeArray>k__BackingField")]
+        public static extern ref DateTime[] ValueTypeArray(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeEnumerable>k__BackingField")]
+        public static extern ref IEnumerable<byte> ValueTypeEnumerable(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeIList>k__BackingField")]
+        public static extern ref IList<byte> ValueTypeIList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeList>k__BackingField")]
+        public static extern ref List<short> ValueTypeList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_ownedField")]
+        public static extern ref CompiledModelTestBase.OwnedType _ownedField(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Deriveds>k__BackingField")]
+        public static extern ref ICollection<CompiledModelTestBase.PrincipalBase> Deriveds(CompiledModelTestBase.PrincipalBase @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalDerivedEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalDerivedEntityType.cs
new file mode 100644
index 00000000..66e60426
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalDerivedEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                baseEntityType,
+                discriminatorProperty: "Discriminator",
+                discriminatorValue: "PrincipalDerived<DependentBase<byte?>>",
+                propertyCount: 0,
+                navigationCount: 2,
+                skipNavigationCount: 1);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeSkipNavigation CreateSkipNavigation1(RuntimeEntityType declaringEntityType, RuntimeEntityType targetEntityType, RuntimeEntityType joinEntityType)
+        {
+            var skipNavigation = declaringEntityType.AddSkipNavigation(
+                "Principals",
+                targetEntityType,
+                joinEntityType.FindForeignKey(
+                    new[] { joinEntityType.FindProperty("DerivedsId"), joinEntityType.FindProperty("DerivedsAlternateId") },
+                    declaringEntityType.FindKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") }),
+                    declaringEntityType),
+                true,
+                false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Principals", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Principals>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var inverse = targetEntityType.FindSkipNavigation("Deriveds");
+            if (inverse != null)
+            {
+                skipNavigation.Inverse = inverse;
+                inverse.Inverse = skipNavigation;
+            }
+
+            skipNavigation.SetGetter(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance),
+                bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance) == null);
+            skipNavigation.SetSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance) = value;
+                    return instance;
+                });
+            skipNavigation.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance) = value;
+                    return instance;
+                });
+            skipNavigation.SetAccessors(
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                null,
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => entry.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(skipNavigation));
+            skipNavigation.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 6,
+                storeGenerationIndex: -1);
+            skipNavigation.SetCollectionAccessor<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(entity),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, Action<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, ICollection<CompiledModelTestBase.PrincipalBase>> setter) => ClrCollectionAccessorFactory.CreateAndSetHashSet<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(entity, setter),
+                ICollection<CompiledModelTestBase.PrincipalBase> () => ((ICollection<CompiledModelTestBase.PrincipalBase>)(((ICollection<CompiledModelTestBase.PrincipalBase>)(new HashSet<CompiledModelTestBase.PrincipalBase>(ReferenceEqualityComparer.Instance))))));
+            return skipNavigation;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var alternateId = runtimeEntityType.FindProperty("AlternateId");
+            var discriminator = runtimeEntityType.FindProperty("Discriminator");
+            var enum1 = runtimeEntityType.FindProperty("Enum1");
+            var enum2 = runtimeEntityType.FindProperty("Enum2");
+            var flagsEnum1 = runtimeEntityType.FindProperty("FlagsEnum1");
+            var flagsEnum2 = runtimeEntityType.FindProperty("FlagsEnum2");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var owned = runtimeEntityType.FindNavigation("Owned");
+            var dependent = runtimeEntityType.FindNavigation("Dependent");
+            var manyOwned = runtimeEntityType.FindNavigation("ManyOwned");
+            var deriveds = runtimeEntityType.FindSkipNavigation("Deriveds");
+            var principals = runtimeEntityType.FindSkipNavigation("Principals");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, Guid, string, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum, CompiledModelTestBase.AFlagsEnum, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), (source.GetCurrentValue<string>(discriminator) == null ? null : ((ValueComparer<string>)(((IProperty)discriminator).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(discriminator))), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1)), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => Snapshot.Empty);
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<string>((source.ContainsKey("Discriminator") ? ((string)(source["Discriminator"])) : null)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<string>(default(string)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType8 = ((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, Guid, object, object, object, object, object>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), source.GetCurrentValue<CompiledModelTestBase.OwnedType>(owned), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds)), source.GetCurrentValue<CompiledModelTestBase.DependentBase<byte?>>(dependent), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<IList<CompiledModelTestBase.OwnedType>>(manyOwned)), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(principals)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 15,
+                navigationCount: 5,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 15,
+                shadowCount: 1,
+                relationshipCount: 7,
+                storeGeneratedCount: 0));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalDerivedUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalDerivedUnsafeAccessors.cs
new file mode 100644
index 00000000..105dc525
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalDerivedUnsafeAccessors.cs
@@ -0,0 +1,23 @@
+// <auto-generated />
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class PrincipalDerivedUnsafeAccessors<TDependent>
+        where TDependent : class
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Dependent>k__BackingField")]
+        public static extern ref TDependent Dependent(CompiledModelTestBase.PrincipalDerived<TDependent> @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "ManyOwned")]
+        public static extern ref IList<CompiledModelTestBase.OwnedType> ManyOwned(CompiledModelTestBase.PrincipalDerived<TDependent> @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Principals>k__BackingField")]
+        public static extern ref ICollection<CompiledModelTestBase.PrincipalBase> Principals(CompiledModelTestBase.PrincipalDerived<TDependent> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataEntityType.cs
new file mode 100644
index 00000000..d1482abb
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataEntityType.cs
@@ -0,0 +1,171 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DataEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                typeof(CompiledModelTestBase.Data),
+                baseEntityType,
+                propertyCount: 2,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.SetAccessors(
+                int (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<int>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<int>(0) == 0 ? entry.ReadTemporaryValue<int>(0) : entry.ReadShadowValue<int>(0))),
+                int (IInternalEntry entry) => entry.ReadShadowValue<int>(0),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(id, 0),
+                int (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<int>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: 0,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            id.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<int>(id));
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var blob = runtimeEntityType.AddProperty(
+                "Blob",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.Data).GetProperty("Blob", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.Data).GetField("<Blob>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            blob.SetGetter(
+                byte[] (CompiledModelTestBase.Data instance) => DataUnsafeAccessors.Blob(instance),
+                bool (CompiledModelTestBase.Data instance) => DataUnsafeAccessors.Blob(instance) == null);
+            blob.SetSetter(
+                CompiledModelTestBase.Data (CompiledModelTestBase.Data instance, byte[] value) =>
+                {
+                    DataUnsafeAccessors.Blob(instance) = value;
+                    return instance;
+                });
+            blob.SetMaterializationSetter(
+                CompiledModelTestBase.Data (CompiledModelTestBase.Data instance, byte[] value) =>
+                {
+                    DataUnsafeAccessors.Blob(instance) = value;
+                    return instance;
+                });
+            blob.SetAccessors(
+                byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
+                byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(blob, 1),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(blob));
+            blob.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            blob.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var blob = runtimeEntityType.FindProperty("Blob");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNonNullableFactory<int>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<int>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.Data)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<int, byte[]>(((ValueComparer<int>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(id)), (source.GetCurrentValue<byte[]>(blob) == null ? null : ((ValueComparer<byte[]>)(((IProperty)blob).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(blob))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<int>(((ValueComparer<int>)(((IProperty)id).GetValueComparer())).Snapshot(default(int))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<int>(default(int)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<int>((source.ContainsKey("Id") ? ((int)(source["Id"])) : 0)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<int>(default(int)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.Data)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<int>(((ValueComparer<int>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<int>(id)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 2,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 2,
+                shadowCount: 1,
+                relationshipCount: 1,
+                storeGeneratedCount: 1));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Data");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataUnsafeAccessors.cs
new file mode 100644
index 00000000..193c8970
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataUnsafeAccessors.cs
@@ -0,0 +1,16 @@
+// <auto-generated />
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DataUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Blob>k__BackingField")]
+        public static extern ref byte[] Blob(CompiledModelTestBase.Data @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModelBuilder.cs
new file mode 100644
index 00000000..4642044e
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModelBuilder.cs
@@ -0,0 +1,88 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Update.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 1)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var data = DataEntityType.Create(this);
+
+            DataEntityType.CreateAnnotations(data);
+
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var data = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            data.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", null, relationalModel);
+            var blobColumnBase = new ColumnBase<ColumnMappingBase>("Blob", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Blob", blobColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Id", idColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase = new TableMappingBase<ColumnMappingBase>(data, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, data.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)blobColumnBase, data.FindProperty("Blob")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            data.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dataTable = new Table("Data", null, relationalModel);
+            var idColumn = new Column("Id", "integer", dataTable);
+            dataTable.Columns.Add("Id", idColumn);
+            idColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(idColumn);
+            idColumn.AddAnnotation("Jet:Identity", "1, 1");
+            var blobColumn = new Column("Blob", "longbinary", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("Blob", blobColumn);
+            blobColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(blobColumn);
+            relationalModel.Tables.Add(("Data", null), dataTable);
+            var dataTableMapping = new TableMapping(data, dataTable, null);
+            dataTable.AddTypeMapping(dataTableMapping, false);
+            tableMappings.Add(dataTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, data.FindProperty("Id")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(blobColumn, data.FindProperty("Blob")!, dataTableMapping);
+            var pK_Data = new UniqueConstraint("PK_Data", dataTable, new[] { idColumn });
+            dataTable.PrimaryKey = pK_Data;
+            pK_Data.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<int>(pK_Data));
+            var pK_DataKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                new[] { "Id" });
+            pK_Data.MappedKeys.Add(pK_DataKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DataKey).Add(pK_Data);
+            dataTable.UniqueConstraints.Add("PK_Data", pK_Data);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModelBuilder.cs
new file mode 100644
index 00000000..56d18fa6
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModelBuilder.cs
@@ -0,0 +1,1349 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Update.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 2)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var principalBase = PrincipalBaseEntityType.Create(this);
+            var principalDerived = PrincipalDerivedEntityType.Create(this, principalBase);
+
+            PrincipalBaseEntityType.CreateForeignKey1(principalBase, principalBase);
+
+            PrincipalBaseEntityType.CreateAnnotations(principalBase);
+            PrincipalDerivedEntityType.CreateAnnotations(principalDerived);
+
+            var functions = new Dictionary<string, IDbFunction>();
+            var principalBaseTvf = new RuntimeDbFunction(
+                "PrincipalBaseTvf",
+                this,
+                typeof(IQueryable<CompiledModelTestBase.PrincipalBase>),
+                "PrincipalBaseTvf");
+
+            functions["PrincipalBaseTvf"] = principalBaseTvf;
+
+            AddAnnotation("Relational:DbFunctions", functions);
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var principalBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", null, relationalModel);
+            var discriminatorColumnBase = new ColumnBase<ColumnMappingBase>("Discriminator", "varchar(55)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Discriminator", discriminatorColumnBase);
+            var enum1ColumnBase = new ColumnBase<ColumnMappingBase>("Enum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum1", enum1ColumnBase);
+            var enum2ColumnBase = new ColumnBase<ColumnMappingBase>("Enum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum2", enum2ColumnBase);
+            var flagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum1", flagsEnum1ColumnBase);
+            var flagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum2", flagsEnum2ColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Id", idColumnBase);
+            var manyOwned_DetailsColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Details", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Details", manyOwned_DetailsColumnBase);
+            var manyOwned_NumberColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Number", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Number", manyOwned_NumberColumnBase);
+            var manyOwned_Principal_AlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_AlternateId", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_AlternateId", manyOwned_Principal_AlternateIdColumnBase);
+            var manyOwned_Principal_Enum1ColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_Enum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_Enum1", manyOwned_Principal_Enum1ColumnBase);
+            var manyOwned_Principal_Enum2ColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_Enum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_Enum2", manyOwned_Principal_Enum2ColumnBase);
+            var manyOwned_Principal_FlagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_FlagsEnum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_FlagsEnum1", manyOwned_Principal_FlagsEnum1ColumnBase);
+            var manyOwned_Principal_FlagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_FlagsEnum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_FlagsEnum2", manyOwned_Principal_FlagsEnum2ColumnBase);
+            var manyOwned_Principal_IdColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_Id", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_Id", manyOwned_Principal_IdColumnBase);
+            var manyOwned_Principal_RefTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_RefTypeArray", manyOwned_Principal_RefTypeArrayColumnBase);
+            var manyOwned_Principal_RefTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_RefTypeEnumerable", manyOwned_Principal_RefTypeEnumerableColumnBase);
+            var manyOwned_Principal_RefTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_RefTypeIList", manyOwned_Principal_RefTypeIListColumnBase);
+            var manyOwned_Principal_RefTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_RefTypeList", manyOwned_Principal_RefTypeListColumnBase);
+            var manyOwned_Principal_ValueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_ValueTypeArray", manyOwned_Principal_ValueTypeArrayColumnBase);
+            var manyOwned_Principal_ValueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_ValueTypeEnumerable", manyOwned_Principal_ValueTypeEnumerableColumnBase);
+            var manyOwned_Principal_ValueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_ValueTypeIList", manyOwned_Principal_ValueTypeIListColumnBase);
+            var manyOwned_Principal_ValueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_Principal_ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_Principal_ValueTypeList", manyOwned_Principal_ValueTypeListColumnBase);
+            var manyOwned_RefTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_RefTypeArray", manyOwned_RefTypeArrayColumnBase);
+            var manyOwned_RefTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_RefTypeEnumerable", manyOwned_RefTypeEnumerableColumnBase);
+            var manyOwned_RefTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_RefTypeIList", manyOwned_RefTypeIListColumnBase);
+            var manyOwned_RefTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_RefTypeList", manyOwned_RefTypeListColumnBase);
+            var manyOwned_ValueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_ValueTypeArray", manyOwned_ValueTypeArrayColumnBase);
+            var manyOwned_ValueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_ValueTypeEnumerable", manyOwned_ValueTypeEnumerableColumnBase);
+            var manyOwned_ValueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_ValueTypeIList", manyOwned_ValueTypeIListColumnBase);
+            var manyOwned_ValueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ManyOwned_ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ManyOwned_ValueTypeList", manyOwned_ValueTypeListColumnBase);
+            var owned_DetailsColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Details", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Details", owned_DetailsColumnBase);
+            var owned_NumberColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Number", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Number", owned_NumberColumnBase);
+            var owned_Principal_AlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_AlternateId", "uniqueidentifier", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_AlternateId", owned_Principal_AlternateIdColumnBase);
+            var owned_Principal_Enum1ColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_Enum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_Enum1", owned_Principal_Enum1ColumnBase);
+            var owned_Principal_Enum2ColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_Enum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_Enum2", owned_Principal_Enum2ColumnBase);
+            var owned_Principal_FlagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_FlagsEnum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_FlagsEnum1", owned_Principal_FlagsEnum1ColumnBase);
+            var owned_Principal_FlagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_FlagsEnum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_FlagsEnum2", owned_Principal_FlagsEnum2ColumnBase);
+            var owned_Principal_IdColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_Id", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_Id", owned_Principal_IdColumnBase);
+            var owned_Principal_RefTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_RefTypeArray", owned_Principal_RefTypeArrayColumnBase);
+            var owned_Principal_RefTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_RefTypeEnumerable", owned_Principal_RefTypeEnumerableColumnBase);
+            var owned_Principal_RefTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_RefTypeIList", owned_Principal_RefTypeIListColumnBase);
+            var owned_Principal_RefTypeListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_RefTypeList", owned_Principal_RefTypeListColumnBase);
+            var owned_Principal_ValueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_ValueTypeArray", owned_Principal_ValueTypeArrayColumnBase);
+            var owned_Principal_ValueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_ValueTypeEnumerable", owned_Principal_ValueTypeEnumerableColumnBase);
+            var owned_Principal_ValueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_ValueTypeIList", owned_Principal_ValueTypeIListColumnBase);
+            var owned_Principal_ValueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_ValueTypeList", owned_Principal_ValueTypeListColumnBase);
+            var owned_RefTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("Owned_RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_RefTypeArray", owned_RefTypeArrayColumnBase);
+            var owned_RefTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("Owned_RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_RefTypeEnumerable", owned_RefTypeEnumerableColumnBase);
+            var owned_RefTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_RefTypeIList", owned_RefTypeIListColumnBase);
+            var owned_RefTypeListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_RefTypeList", owned_RefTypeListColumnBase);
+            var owned_ValueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("Owned_ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_ValueTypeArray", owned_ValueTypeArrayColumnBase);
+            var owned_ValueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("Owned_ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_ValueTypeEnumerable", owned_ValueTypeEnumerableColumnBase);
+            var owned_ValueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_ValueTypeIList", owned_ValueTypeIListColumnBase);
+            var owned_ValueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_ValueTypeList", owned_ValueTypeListColumnBase);
+            var principalBaseIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalBaseId", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("PrincipalBaseId", principalBaseIdColumnBase);
+            var refTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase);
+            var refTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase);
+            var refTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase);
+            var refTypeListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeList", refTypeListColumnBase);
+            var valueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase);
+            var valueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase);
+            var valueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase);
+            var valueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase = new TableMappingBase<ColumnMappingBase>(principalBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, principalBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)discriminatorColumnBase, principalBase.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalBase.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalBase.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalBase.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalBase.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase, principalBase.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalBase.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalBase.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalBase.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalBase.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalBase.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalBase.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalBase.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalBase.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var principalBaseTable = new Table("PrincipalBase", null, relationalModel);
+            var idColumn = new Column("Id", "decimal(20,0)", principalBaseTable);
+            principalBaseTable.Columns.Add("Id", idColumn);
+            idColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(idColumn);
+            idColumn.AddAnnotation("Jet:Identity", "1, 1");
+            var deetsColumn = new Column("Deets", "varchar(64)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Deets", deetsColumn);
+            deetsColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(deetsColumn);
+            var discriminatorColumn = new Column("Discriminator", "varchar(55)", principalBaseTable);
+            principalBaseTable.Columns.Add("Discriminator", discriminatorColumn);
+            discriminatorColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(discriminatorColumn);
+            var enum1Column = new Column("Enum1", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("Enum1", enum1Column);
+            enum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum1Column);
+            var enum2Column = new Column("Enum2", "integer", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Enum2", enum2Column);
+            enum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum2Column);
+            var flagsEnum1Column = new Column("FlagsEnum1", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum1", flagsEnum1Column);
+            flagsEnum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum1Column);
+            var flagsEnum2Column = new Column("FlagsEnum2", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum2", flagsEnum2Column);
+            flagsEnum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum2Column);
+            var manyOwnedColumn = new JsonColumn("ManyOwned", "longchar", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ManyOwned", manyOwnedColumn);
+            manyOwnedColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<JsonElement>(manyOwnedColumn);
+            var owned_NumberColumn = new Column("Owned_Number", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("Owned_Number", owned_NumberColumn);
+            owned_NumberColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(owned_NumberColumn);
+            var owned_Principal_AlternateIdColumn = new Column("Owned_Principal_AlternateId", "uniqueidentifier", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_AlternateId", owned_Principal_AlternateIdColumn);
+            owned_Principal_AlternateIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<Guid>(owned_Principal_AlternateIdColumn);
+            var owned_Principal_Enum1Column = new Column("Owned_Principal_Enum1", "integer", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_Enum1", owned_Principal_Enum1Column);
+            owned_Principal_Enum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(owned_Principal_Enum1Column);
+            var owned_Principal_Enum2Column = new Column("Owned_Principal_Enum2", "integer", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_Enum2", owned_Principal_Enum2Column);
+            owned_Principal_Enum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(owned_Principal_Enum2Column);
+            var owned_Principal_FlagsEnum1Column = new Column("Owned_Principal_FlagsEnum1", "integer", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_FlagsEnum1", owned_Principal_FlagsEnum1Column);
+            owned_Principal_FlagsEnum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(owned_Principal_FlagsEnum1Column);
+            var owned_Principal_FlagsEnum2Column = new Column("Owned_Principal_FlagsEnum2", "integer", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_FlagsEnum2", owned_Principal_FlagsEnum2Column);
+            owned_Principal_FlagsEnum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(owned_Principal_FlagsEnum2Column);
+            var owned_Principal_IdColumn = new Column("Owned_Principal_Id", "decimal(20,0)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_Id", owned_Principal_IdColumn);
+            owned_Principal_IdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(owned_Principal_IdColumn);
+            var owned_Principal_RefTypeArrayColumn = new Column("Owned_Principal_RefTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_RefTypeArray", owned_Principal_RefTypeArrayColumn);
+            owned_Principal_RefTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_Principal_RefTypeArrayColumn);
+            var owned_Principal_RefTypeEnumerableColumn = new Column("Owned_Principal_RefTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_RefTypeEnumerable", owned_Principal_RefTypeEnumerableColumn);
+            owned_Principal_RefTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_Principal_RefTypeEnumerableColumn);
+            var owned_Principal_RefTypeIListColumn = new Column("Owned_Principal_RefTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_RefTypeIList", owned_Principal_RefTypeIListColumn);
+            owned_Principal_RefTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_Principal_RefTypeIListColumn);
+            var owned_Principal_RefTypeListColumn = new Column("Owned_Principal_RefTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_RefTypeList", owned_Principal_RefTypeListColumn);
+            owned_Principal_RefTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_Principal_RefTypeListColumn);
+            var owned_Principal_ValueTypeArrayColumn = new Column("Owned_Principal_ValueTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_ValueTypeArray", owned_Principal_ValueTypeArrayColumn);
+            owned_Principal_ValueTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_Principal_ValueTypeArrayColumn);
+            var owned_Principal_ValueTypeEnumerableColumn = new Column("Owned_Principal_ValueTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_ValueTypeEnumerable", owned_Principal_ValueTypeEnumerableColumn);
+            owned_Principal_ValueTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_Principal_ValueTypeEnumerableColumn);
+            var owned_Principal_ValueTypeIListColumn = new Column("Owned_Principal_ValueTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_ValueTypeIList", owned_Principal_ValueTypeIListColumn);
+            owned_Principal_ValueTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_Principal_ValueTypeIListColumn);
+            var owned_Principal_ValueTypeListColumn = new Column("Owned_Principal_ValueTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_ValueTypeList", owned_Principal_ValueTypeListColumn);
+            owned_Principal_ValueTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_Principal_ValueTypeListColumn);
+            var owned_RefTypeArrayColumn = new Column("Owned_RefTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeArray", owned_RefTypeArrayColumn);
+            owned_RefTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_RefTypeArrayColumn);
+            var owned_RefTypeEnumerableColumn = new Column("Owned_RefTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeEnumerable", owned_RefTypeEnumerableColumn);
+            owned_RefTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_RefTypeEnumerableColumn);
+            var owned_RefTypeIListColumn = new Column("Owned_RefTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeIList", owned_RefTypeIListColumn);
+            owned_RefTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_RefTypeIListColumn);
+            var owned_RefTypeListColumn = new Column("Owned_RefTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeList", owned_RefTypeListColumn);
+            owned_RefTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_RefTypeListColumn);
+            var owned_ValueTypeArrayColumn = new Column("Owned_ValueTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeArray", owned_ValueTypeArrayColumn);
+            owned_ValueTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_ValueTypeArrayColumn);
+            var owned_ValueTypeEnumerableColumn = new Column("Owned_ValueTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeEnumerable", owned_ValueTypeEnumerableColumn);
+            owned_ValueTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_ValueTypeEnumerableColumn);
+            var owned_ValueTypeIListColumn = new Column("Owned_ValueTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeIList", owned_ValueTypeIListColumn);
+            owned_ValueTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_ValueTypeIListColumn);
+            var owned_ValueTypeListColumn = new Column("Owned_ValueTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeList", owned_ValueTypeListColumn);
+            owned_ValueTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(owned_ValueTypeListColumn);
+            var principalBaseIdColumn = new Column("PrincipalBaseId", "decimal(20,0)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("PrincipalBaseId", principalBaseIdColumn);
+            principalBaseIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(principalBaseIdColumn);
+            var refTypeArrayColumn = new Column("RefTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeArray", refTypeArrayColumn);
+            refTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeArrayColumn);
+            var refTypeEnumerableColumn = new Column("RefTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn);
+            refTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeEnumerableColumn);
+            var refTypeIListColumn = new Column("RefTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeIList", refTypeIListColumn);
+            refTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeIListColumn);
+            var refTypeListColumn = new Column("RefTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeList", refTypeListColumn);
+            refTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeListColumn);
+            var valueTypeArrayColumn = new Column("ValueTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn);
+            valueTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeArrayColumn);
+            var valueTypeEnumerableColumn = new Column("ValueTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn);
+            valueTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeEnumerableColumn);
+            var valueTypeIListColumn = new Column("ValueTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeIList", valueTypeIListColumn);
+            valueTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeIListColumn);
+            var valueTypeListColumn = new Column("ValueTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeList", valueTypeListColumn);
+            valueTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeListColumn);
+            relationalModel.Tables.Add(("PrincipalBase", null), principalBaseTable);
+            var principalBaseTableMapping = new TableMapping(principalBase, principalBaseTable, true)
+            {
+                IsSharedTablePrincipal = true,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping, false);
+            tableMappings.Add(principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, principalBase.FindProperty("Id")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(discriminatorColumn, principalBase.FindProperty("Discriminator")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum1Column, principalBase.FindProperty("Enum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum2Column, principalBase.FindProperty("Enum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalBase.FindProperty("FlagsEnum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalBase.FindProperty("FlagsEnum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalBase.FindProperty("RefTypeList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseTableMapping);
+
+            var viewMappings = new List<ViewMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:ViewMappings", viewMappings);
+            var principalBaseViewView = new View("PrincipalBaseView", null, relationalModel);
+            var discriminatorViewColumn = new ViewColumn("Discriminator", "varchar(55)", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Discriminator", discriminatorViewColumn);
+            var enum1ViewColumn = new ViewColumn("Enum1", "integer", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Enum1", enum1ViewColumn);
+            var enum2ViewColumn = new ViewColumn("Enum2", "integer", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("Enum2", enum2ViewColumn);
+            var flagsEnum1ViewColumn = new ViewColumn("FlagsEnum1", "integer", principalBaseViewView);
+            principalBaseViewView.Columns.Add("FlagsEnum1", flagsEnum1ViewColumn);
+            var flagsEnum2ViewColumn = new ViewColumn("FlagsEnum2", "integer", principalBaseViewView);
+            principalBaseViewView.Columns.Add("FlagsEnum2", flagsEnum2ViewColumn);
+            var idViewColumn = new ViewColumn("Id", "decimal(20,0)", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Id", idViewColumn);
+            var principalBaseIdViewColumn = new ViewColumn("PrincipalBaseId", "decimal(20,0)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("PrincipalBaseId", principalBaseIdViewColumn);
+            var refTypeArrayViewColumn = new ViewColumn("RefTypeArray", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeArray", refTypeArrayViewColumn);
+            var refTypeEnumerableViewColumn = new ViewColumn("RefTypeEnumerable", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeEnumerable", refTypeEnumerableViewColumn);
+            var refTypeIListViewColumn = new ViewColumn("RefTypeIList", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeIList", refTypeIListViewColumn);
+            var refTypeListViewColumn = new ViewColumn("RefTypeList", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeList", refTypeListViewColumn);
+            var valueTypeArrayViewColumn = new ViewColumn("ValueTypeArray", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeArray", valueTypeArrayViewColumn);
+            var valueTypeEnumerableViewColumn = new ViewColumn("ValueTypeEnumerable", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableViewColumn);
+            var valueTypeIListViewColumn = new ViewColumn("ValueTypeIList", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeIList", valueTypeIListViewColumn);
+            var valueTypeListViewColumn = new ViewColumn("ValueTypeList", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeList", valueTypeListViewColumn);
+            relationalModel.Views.Add(("PrincipalBaseView", null), principalBaseViewView);
+            var principalBaseViewViewMapping = new ViewMapping(principalBase, principalBaseViewView, true);
+            principalBaseViewView.AddTypeMapping(principalBaseViewViewMapping, false);
+            viewMappings.Add(principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(idViewColumn, principalBase.FindProperty("Id")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(discriminatorViewColumn, principalBase.FindProperty("Discriminator")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum1ViewColumn, principalBase.FindProperty("Enum1")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum2ViewColumn, principalBase.FindProperty("Enum2")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum1ViewColumn, principalBase.FindProperty("FlagsEnum1")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum2ViewColumn, principalBase.FindProperty("FlagsEnum2")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalBaseIdViewColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeArrayViewColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeEnumerableViewColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeIListViewColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeListViewColumn, principalBase.FindProperty("RefTypeList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeArrayViewColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeEnumerableViewColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeIListViewColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeListViewColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseViewViewMapping);
+
+            var sqlQueryMappings = new List<SqlQueryMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:SqlQueryMappings", sqlQueryMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery = new SqlQuery("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.MappedSqlQuery", relationalModel, "select * from PrincipalBase");
+            var discriminatorSqlQueryColumn = new SqlQueryColumn("Discriminator", "varchar(55)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("Discriminator", discriminatorSqlQueryColumn);
+            var enum1SqlQueryColumn = new SqlQueryColumn("Enum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("Enum1", enum1SqlQueryColumn);
+            var enum2SqlQueryColumn = new SqlQueryColumn("Enum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("Enum2", enum2SqlQueryColumn);
+            var flagsEnum1SqlQueryColumn = new SqlQueryColumn("FlagsEnum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("FlagsEnum1", flagsEnum1SqlQueryColumn);
+            var flagsEnum2SqlQueryColumn = new SqlQueryColumn("FlagsEnum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("FlagsEnum2", flagsEnum2SqlQueryColumn);
+            var idSqlQueryColumn = new SqlQueryColumn("Id", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("Id", idSqlQueryColumn);
+            var principalBaseIdSqlQueryColumn = new SqlQueryColumn("PrincipalBaseId", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("PrincipalBaseId", principalBaseIdSqlQueryColumn);
+            var refTypeArraySqlQueryColumn = new SqlQueryColumn("RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("RefTypeArray", refTypeArraySqlQueryColumn);
+            var refTypeEnumerableSqlQueryColumn = new SqlQueryColumn("RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("RefTypeEnumerable", refTypeEnumerableSqlQueryColumn);
+            var refTypeIListSqlQueryColumn = new SqlQueryColumn("RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("RefTypeIList", refTypeIListSqlQueryColumn);
+            var refTypeListSqlQueryColumn = new SqlQueryColumn("RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("RefTypeList", refTypeListSqlQueryColumn);
+            var valueTypeArraySqlQueryColumn = new SqlQueryColumn("ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("ValueTypeArray", valueTypeArraySqlQueryColumn);
+            var valueTypeEnumerableSqlQueryColumn = new SqlQueryColumn("ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableSqlQueryColumn);
+            var valueTypeIListSqlQueryColumn = new SqlQueryColumn("ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("ValueTypeIList", valueTypeIListSqlQueryColumn);
+            var valueTypeListSqlQueryColumn = new SqlQueryColumn("ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("ValueTypeList", valueTypeListSqlQueryColumn);
+            relationalModel.Queries.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.MappedSqlQuery", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping = new SqlQueryMapping(principalBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping, false);
+            sqlQueryMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping.IsDefaultSqlQueryMapping = true;
+            RelationalModel.CreateSqlQueryColumnMapping(idSqlQueryColumn, principalBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(discriminatorSqlQueryColumn, principalBase.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(enum1SqlQueryColumn, principalBase.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(enum2SqlQueryColumn, principalBase.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(flagsEnum1SqlQueryColumn, principalBase.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(flagsEnum2SqlQueryColumn, principalBase.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(principalBaseIdSqlQueryColumn, principalBase.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeArraySqlQueryColumn, principalBase.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeEnumerableSqlQueryColumn, principalBase.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeIListSqlQueryColumn, principalBase.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeListSqlQueryColumn, principalBase.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeArraySqlQueryColumn, principalBase.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeEnumerableSqlQueryColumn, principalBase.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeIListSqlQueryColumn, principalBase.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeListSqlQueryColumn, principalBase.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+
+            var functionMappings = new List<FunctionMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:FunctionMappings", functionMappings);
+            var principalBaseTvf = (IRuntimeDbFunction)this.FindDbFunction("PrincipalBaseTvf")!;
+            var principalBaseTvfFunction = new StoreFunction(principalBaseTvf, relationalModel);
+            var discriminatorFunctionColumn = new FunctionColumn("Discriminator", "varchar(55)", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("Discriminator", discriminatorFunctionColumn);
+            var enum1FunctionColumn = new FunctionColumn("Enum1", "integer", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("Enum1", enum1FunctionColumn);
+            var enum2FunctionColumn = new FunctionColumn("Enum2", "integer", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("Enum2", enum2FunctionColumn);
+            var flagsEnum1FunctionColumn = new FunctionColumn("FlagsEnum1", "integer", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("FlagsEnum1", flagsEnum1FunctionColumn);
+            var flagsEnum2FunctionColumn = new FunctionColumn("FlagsEnum2", "integer", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("FlagsEnum2", flagsEnum2FunctionColumn);
+            var idFunctionColumn = new FunctionColumn("Id", "decimal(20,0)", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("Id", idFunctionColumn);
+            var principalBaseIdFunctionColumn = new FunctionColumn("PrincipalBaseId", "decimal(20,0)", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("PrincipalBaseId", principalBaseIdFunctionColumn);
+            var refTypeArrayFunctionColumn = new FunctionColumn("RefTypeArray", "varchar(255)", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("RefTypeArray", refTypeArrayFunctionColumn);
+            var refTypeEnumerableFunctionColumn = new FunctionColumn("RefTypeEnumerable", "varchar(255)", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("RefTypeEnumerable", refTypeEnumerableFunctionColumn);
+            var refTypeIListFunctionColumn = new FunctionColumn("RefTypeIList", "varchar(255)", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("RefTypeIList", refTypeIListFunctionColumn);
+            var refTypeListFunctionColumn = new FunctionColumn("RefTypeList", "varchar(255)", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("RefTypeList", refTypeListFunctionColumn);
+            var valueTypeArrayFunctionColumn = new FunctionColumn("ValueTypeArray", "varchar(255)", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("ValueTypeArray", valueTypeArrayFunctionColumn);
+            var valueTypeEnumerableFunctionColumn = new FunctionColumn("ValueTypeEnumerable", "varchar(255)", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableFunctionColumn);
+            var valueTypeIListFunctionColumn = new FunctionColumn("ValueTypeIList", "varchar(255)", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("ValueTypeIList", valueTypeIListFunctionColumn);
+            var valueTypeListFunctionColumn = new FunctionColumn("ValueTypeList", "varchar(255)", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("ValueTypeList", valueTypeListFunctionColumn);
+            relationalModel.Functions.Add(
+                ("PrincipalBaseTvf", null, new string[0]),
+                principalBaseTvfFunction);
+            var principalBaseTvfFunctionMapping = new FunctionMapping(principalBase, principalBaseTvfFunction, principalBaseTvf, true);
+            principalBaseTvfFunction.AddTypeMapping(principalBaseTvfFunctionMapping, false);
+            functionMappings.Add(principalBaseTvfFunctionMapping);
+            principalBaseTvfFunctionMapping.IsDefaultFunctionMapping = true;
+            RelationalModel.CreateFunctionColumnMapping(idFunctionColumn, principalBase.FindProperty("Id")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(discriminatorFunctionColumn, principalBase.FindProperty("Discriminator")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(enum1FunctionColumn, principalBase.FindProperty("Enum1")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(enum2FunctionColumn, principalBase.FindProperty("Enum2")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(flagsEnum1FunctionColumn, principalBase.FindProperty("FlagsEnum1")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(flagsEnum2FunctionColumn, principalBase.FindProperty("FlagsEnum2")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(principalBaseIdFunctionColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(refTypeArrayFunctionColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(refTypeEnumerableFunctionColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(refTypeIListFunctionColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(refTypeListFunctionColumn, principalBase.FindProperty("RefTypeList")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(valueTypeArrayFunctionColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(valueTypeEnumerableFunctionColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(valueTypeIListFunctionColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(valueTypeListFunctionColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseTvfFunctionMapping);
+
+            var deleteSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:DeleteStoredProcedureMappings", deleteSprocMappings);
+            var principalBase_DeleteStoreSproc = new StoreStoredProcedure("PrincipalBase_Delete", null, relationalModel);
+            var rowsAffectedParameter = new StoreStoredProcedureParameter("RowsAffected", "integer", 0, principalBase_DeleteStoreSproc, System.Data.ParameterDirection.Output);
+            principalBase_DeleteStoreSproc.AddParameter(rowsAffectedParameter);
+            var id_OriginalParameter = new StoreStoredProcedureParameter("Id_Original", "decimal(20,0)", 1, principalBase_DeleteStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_DeleteStoreSproc.AddParameter(id_OriginalParameter);
+            principalBase_DeleteStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Delete", null), principalBase_DeleteStoreSproc);
+            var principalBase_DeleteDSproc = (IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!;
+            var principalBase_DeleteSprocMapping = new StoredProcedureMapping(principalBase, principalBase_DeleteStoreSproc, principalBase_DeleteDSproc, principalBaseTableMapping, true);
+            principalBase_DeleteStoreSproc.AddTypeMapping(principalBase_DeleteSprocMapping, false);
+            deleteSprocMappings.Add(principalBase_DeleteSprocMapping);
+            principalBaseTableMapping.DeleteStoredProcedureMapping = principalBase_DeleteSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter, principalBase_DeleteDSproc.FindParameter("Id_Original")!, principalBase.FindProperty("Id")!, principalBase_DeleteSprocMapping);
+
+            var insertSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:InsertStoredProcedureMappings", insertSprocMappings);
+            var principalBase_InsertStoreSproc = new StoreStoredProcedure("PrincipalBase_Insert", null, relationalModel);
+            var principalBaseIdParameter = new StoreStoredProcedureParameter("PrincipalBaseId", "decimal(20,0)", 0, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(principalBaseIdParameter);
+            var enum1Parameter = new StoreStoredProcedureParameter("Enum1", "integer", 1, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(enum1Parameter);
+            var enum2Parameter = new StoreStoredProcedureParameter("Enum2", "integer", 2, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(enum2Parameter);
+            var flagsEnum1Parameter = new StoreStoredProcedureParameter("FlagsEnum1", "integer", 3, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(flagsEnum1Parameter);
+            var flagsEnum2Parameter = new StoreStoredProcedureParameter("FlagsEnum2", "integer", 4, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(flagsEnum2Parameter);
+            var valueTypeListParameter = new StoreStoredProcedureParameter("ValueTypeList", "varchar(255)", 5, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeListParameter);
+            var valueTypeIListParameter = new StoreStoredProcedureParameter("ValueTypeIList", "varchar(255)", 6, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeIListParameter);
+            var valueTypeArrayParameter = new StoreStoredProcedureParameter("ValueTypeArray", "varchar(255)", 7, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeArrayParameter);
+            var valueTypeEnumerableParameter = new StoreStoredProcedureParameter("ValueTypeEnumerable", "varchar(255)", 8, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeEnumerableParameter);
+            var refTypeListParameter = new StoreStoredProcedureParameter("RefTypeList", "varchar(255)", 9, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeListParameter);
+            var refTypeIListParameter = new StoreStoredProcedureParameter("RefTypeIList", "varchar(255)", 10, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeIListParameter);
+            var refTypeArrayParameter = new StoreStoredProcedureParameter("RefTypeArray", "varchar(255)", 11, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeArrayParameter);
+            var refTypeEnumerableParameter = new StoreStoredProcedureParameter("RefTypeEnumerable", "varchar(255)", 12, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeEnumerableParameter);
+            var discriminatorParameter = new StoreStoredProcedureParameter("Discriminator", "varchar(55)", 13, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(discriminatorParameter);
+            var idParameter = new StoreStoredProcedureParameter("Id", "decimal(20,0)", 14, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Output);
+            principalBase_InsertStoreSproc.AddParameter(idParameter);
+            principalBase_InsertStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Insert", null), principalBase_InsertStoreSproc);
+            var principalBase_InsertISproc = (IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!;
+            var principalBase_InsertSprocMapping = new StoredProcedureMapping(principalBase, principalBase_InsertStoreSproc, principalBase_InsertISproc, principalBaseTableMapping, true);
+            principalBase_InsertStoreSproc.AddTypeMapping(principalBase_InsertSprocMapping, false);
+            insertSprocMappings.Add(principalBase_InsertSprocMapping);
+            principalBaseTableMapping.InsertStoredProcedureMapping = principalBase_InsertSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(idParameter, principalBase_InsertISproc.FindParameter("Id")!, principalBase.FindProperty("Id")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(discriminatorParameter, principalBase_InsertISproc.FindParameter("Discriminator")!, principalBase.FindProperty("Discriminator")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter, principalBase_InsertISproc.FindParameter("Enum1")!, principalBase.FindProperty("Enum1")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter, principalBase_InsertISproc.FindParameter("Enum2")!, principalBase.FindProperty("Enum2")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum1")!, principalBase.FindProperty("FlagsEnum1")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum2")!, principalBase.FindProperty("FlagsEnum2")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter, principalBase_InsertISproc.FindParameter("PrincipalBaseId")!, principalBase.FindProperty("PrincipalBaseId")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter, principalBase_InsertISproc.FindParameter("RefTypeArray")!, principalBase.FindProperty("RefTypeArray")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("RefTypeEnumerable")!, principalBase.FindProperty("RefTypeEnumerable")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter, principalBase_InsertISproc.FindParameter("RefTypeIList")!, principalBase.FindProperty("RefTypeIList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter, principalBase_InsertISproc.FindParameter("RefTypeList")!, principalBase.FindProperty("RefTypeList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter, principalBase_InsertISproc.FindParameter("ValueTypeArray")!, principalBase.FindProperty("ValueTypeArray")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("ValueTypeEnumerable")!, principalBase.FindProperty("ValueTypeEnumerable")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter, principalBase_InsertISproc.FindParameter("ValueTypeIList")!, principalBase.FindProperty("ValueTypeIList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter, principalBase_InsertISproc.FindParameter("ValueTypeList")!, principalBase.FindProperty("ValueTypeList")!, principalBase_InsertSprocMapping);
+
+            var updateSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:UpdateStoredProcedureMappings", updateSprocMappings);
+            var principalBase_UpdateStoreSproc = new StoreStoredProcedure("PrincipalBase_Update", null, relationalModel);
+            var principalBaseIdParameter0 = new StoreStoredProcedureParameter("PrincipalBaseId", "decimal(20,0)", 0, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(principalBaseIdParameter0);
+            var enum1Parameter0 = new StoreStoredProcedureParameter("Enum1", "integer", 1, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(enum1Parameter0);
+            var enum2Parameter0 = new StoreStoredProcedureParameter("Enum2", "integer", 2, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(enum2Parameter0);
+            var flagsEnum1Parameter0 = new StoreStoredProcedureParameter("FlagsEnum1", "integer", 3, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(flagsEnum1Parameter0);
+            var flagsEnum2Parameter0 = new StoreStoredProcedureParameter("FlagsEnum2", "integer", 4, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(flagsEnum2Parameter0);
+            var valueTypeListParameter0 = new StoreStoredProcedureParameter("ValueTypeList", "varchar(255)", 5, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeListParameter0);
+            var valueTypeIListParameter0 = new StoreStoredProcedureParameter("ValueTypeIList", "varchar(255)", 6, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeIListParameter0);
+            var valueTypeArrayParameter0 = new StoreStoredProcedureParameter("ValueTypeArray", "varchar(255)", 7, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeArrayParameter0);
+            var valueTypeEnumerableParameter0 = new StoreStoredProcedureParameter("ValueTypeEnumerable", "varchar(255)", 8, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeEnumerableParameter0);
+            var refTypeListParameter0 = new StoreStoredProcedureParameter("RefTypeList", "varchar(255)", 9, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeListParameter0);
+            var refTypeIListParameter0 = new StoreStoredProcedureParameter("RefTypeIList", "varchar(255)", 10, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeIListParameter0);
+            var refTypeArrayParameter0 = new StoreStoredProcedureParameter("RefTypeArray", "varchar(255)", 11, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeArrayParameter0);
+            var refTypeEnumerableParameter0 = new StoreStoredProcedureParameter("RefTypeEnumerable", "varchar(255)", 12, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeEnumerableParameter0);
+            var id_OriginalParameter0 = new StoreStoredProcedureParameter("Id_Original", "decimal(20,0)", 13, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(id_OriginalParameter0);
+            principalBase_UpdateStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Update", null), principalBase_UpdateStoreSproc);
+            var principalBase_UpdateUSproc = (IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!;
+            var principalBase_UpdateSprocMapping = new StoredProcedureMapping(principalBase, principalBase_UpdateStoreSproc, principalBase_UpdateUSproc, principalBaseTableMapping, true);
+            principalBase_UpdateStoreSproc.AddTypeMapping(principalBase_UpdateSprocMapping, false);
+            updateSprocMappings.Add(principalBase_UpdateSprocMapping);
+            principalBaseTableMapping.UpdateStoredProcedureMapping = principalBase_UpdateSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter0, principalBase_UpdateUSproc.FindParameter("Id_Original")!, principalBase.FindProperty("Id")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter0, principalBase_UpdateUSproc.FindParameter("Enum1")!, principalBase.FindProperty("Enum1")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter0, principalBase_UpdateUSproc.FindParameter("Enum2")!, principalBase.FindProperty("Enum2")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum1")!, principalBase.FindProperty("FlagsEnum1")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum2")!, principalBase.FindProperty("FlagsEnum2")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter0, principalBase_UpdateUSproc.FindParameter("PrincipalBaseId")!, principalBase.FindProperty("PrincipalBaseId")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeArray")!, principalBase.FindProperty("RefTypeArray")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeEnumerable")!, principalBase.FindProperty("RefTypeEnumerable")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeIList")!, principalBase.FindProperty("RefTypeIList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeList")!, principalBase.FindProperty("RefTypeList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeArray")!, principalBase.FindProperty("ValueTypeArray")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeEnumerable")!, principalBase.FindProperty("ValueTypeEnumerable")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeIList")!, principalBase.FindProperty("ValueTypeIList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeList")!, principalBase.FindProperty("ValueTypeList")!, principalBase_UpdateSprocMapping);
+
+            var ownedType = principalBase.FindComplexProperty("Owned")!.ComplexType;
+
+            var defaultTableMappings0 = new List<TableMappingBase<ColumnMappingBase>>();
+            ownedType.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0 = new TableMappingBase<ColumnMappingBase>(ownedType, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0, false);
+            defaultTableMappings0.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_DetailsColumnBase, ownedType.FindProperty("Details")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_NumberColumnBase, ownedType.FindProperty("Number")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_RefTypeArrayColumnBase, ownedType.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_RefTypeEnumerableColumnBase, ownedType.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_RefTypeIListColumnBase, ownedType.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_RefTypeListColumnBase, ownedType.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_ValueTypeArrayColumnBase, ownedType.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_ValueTypeEnumerableColumnBase, ownedType.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_ValueTypeIListColumnBase, ownedType.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_ValueTypeListColumnBase, ownedType.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+
+            var tableMappings0 = new List<TableMapping>();
+            ownedType.SetRuntimeAnnotation("Relational:TableMappings", tableMappings0);
+            var principalBaseTableMapping0 = new TableMapping(ownedType, principalBaseTable, true);
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping0, false);
+            tableMappings0.Add(principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(deetsColumn, ownedType.FindProperty("Details")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_NumberColumn, ownedType.FindProperty("Number")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeArrayColumn, ownedType.FindProperty("RefTypeArray")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeEnumerableColumn, ownedType.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeIListColumn, ownedType.FindProperty("RefTypeIList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeListColumn, ownedType.FindProperty("RefTypeList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeArrayColumn, ownedType.FindProperty("ValueTypeArray")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeEnumerableColumn, ownedType.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeIListColumn, ownedType.FindProperty("ValueTypeIList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeListColumn, ownedType.FindProperty("ValueTypeList")!, principalBaseTableMapping0);
+
+            var principalBase0 = ownedType.FindComplexProperty("Principal")!.ComplexType;
+
+            var defaultTableMappings1 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase0.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings1);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1 = new TableMappingBase<ColumnMappingBase>(principalBase0, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1, false);
+            defaultTableMappings1.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_AlternateIdColumnBase, principalBase0.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_Enum1ColumnBase, principalBase0.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_Enum2ColumnBase, principalBase0.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_FlagsEnum1ColumnBase, principalBase0.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_FlagsEnum2ColumnBase, principalBase0.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_IdColumnBase, principalBase0.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_RefTypeArrayColumnBase, principalBase0.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_RefTypeEnumerableColumnBase, principalBase0.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_RefTypeIListColumnBase, principalBase0.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_RefTypeListColumnBase, principalBase0.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_ValueTypeArrayColumnBase, principalBase0.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_ValueTypeEnumerableColumnBase, principalBase0.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_ValueTypeIListColumnBase, principalBase0.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_ValueTypeListColumnBase, principalBase0.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+
+            var tableMappings1 = new List<TableMapping>();
+            principalBase0.SetRuntimeAnnotation("Relational:TableMappings", tableMappings1);
+            var principalBaseTableMapping1 = new TableMapping(principalBase0, principalBaseTable, true);
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping1, true);
+            tableMappings1.Add(principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_AlternateIdColumn, principalBase0.FindProperty("AlternateId")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_Enum1Column, principalBase0.FindProperty("Enum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_Enum2Column, principalBase0.FindProperty("Enum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_FlagsEnum1Column, principalBase0.FindProperty("FlagsEnum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_FlagsEnum2Column, principalBase0.FindProperty("FlagsEnum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_IdColumn, principalBase0.FindProperty("Id")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_RefTypeArrayColumn, principalBase0.FindProperty("RefTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_RefTypeEnumerableColumn, principalBase0.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_RefTypeIListColumn, principalBase0.FindProperty("RefTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_RefTypeListColumn, principalBase0.FindProperty("RefTypeList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_ValueTypeArrayColumn, principalBase0.FindProperty("ValueTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_ValueTypeEnumerableColumn, principalBase0.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_ValueTypeIListColumn, principalBase0.FindProperty("ValueTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_ValueTypeListColumn, principalBase0.FindProperty("ValueTypeList")!, principalBaseTableMapping1);
+
+            var principalDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>")!;
+
+            var defaultTableMappings2 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings2);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2 = new TableMappingBase<ColumnMappingBase>(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2, false);
+            defaultTableMappings2.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)discriminatorColumnBase, principalDerived.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalDerived.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalDerived.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalDerived.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalDerived.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase, principalDerived.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalDerived.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalDerived.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalDerived.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalDerived.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalDerived.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalDerived.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalDerived.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalDerived.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+
+            var tableMappings2 = new List<TableMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings2);
+            var principalBaseTableMapping2 = new TableMapping(principalDerived, principalBaseTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping2, false);
+            tableMappings2.Add(principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(idColumn, principalDerived.FindProperty("Id")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(discriminatorColumn, principalDerived.FindProperty("Discriminator")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(enum1Column, principalDerived.FindProperty("Enum1")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(enum2Column, principalDerived.FindProperty("Enum2")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalDerived.FindProperty("FlagsEnum1")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalDerived.FindProperty("FlagsEnum2")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn, principalDerived.FindProperty("PrincipalBaseId")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalDerived.FindProperty("RefTypeArray")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalDerived.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalDerived.FindProperty("RefTypeIList")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalDerived.FindProperty("RefTypeList")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalDerived.FindProperty("ValueTypeArray")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalDerived.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalDerived.FindProperty("ValueTypeIList")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalDerived.FindProperty("ValueTypeList")!, principalBaseTableMapping2);
+            var pK_PrincipalBase = new UniqueConstraint("PK_PrincipalBase", principalBaseTable, new[] { idColumn });
+            principalBaseTable.PrimaryKey = pK_PrincipalBase;
+            pK_PrincipalBase.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<long>(pK_PrincipalBase));
+            var pK_PrincipalBaseKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            pK_PrincipalBase.MappedKeys.Add(pK_PrincipalBaseKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_PrincipalBaseKey).Add(pK_PrincipalBase);
+            principalBaseTable.UniqueConstraints.Add("PK_PrincipalBase", pK_PrincipalBase);
+            var iX_PrincipalBase_PrincipalBaseId = new TableIndex(
+            "IX_PrincipalBase_PrincipalBaseId", principalBaseTable, new[] { principalBaseIdColumn }, false);
+            iX_PrincipalBase_PrincipalBaseId.SetRowIndexValueFactory(new SimpleRowIndexValueFactory<long>(iX_PrincipalBase_PrincipalBaseId));
+            var iX_PrincipalBase_PrincipalBaseIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalBaseId" });
+            iX_PrincipalBase_PrincipalBaseId.MappedIndexes.Add(iX_PrincipalBase_PrincipalBaseIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBase_PrincipalBaseIdIx).Add(iX_PrincipalBase_PrincipalBaseId);
+            principalBaseTable.Indexes.Add("IX_PrincipalBase_PrincipalBaseId", iX_PrincipalBase_PrincipalBaseId);
+
+            var sqlQueryMappings0 = new List<SqlQueryMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:SqlQueryMappings", sqlQueryMappings0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0 = new SqlQueryMapping(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0, false);
+            sqlQueryMappings0.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0.IsDefaultSqlQueryMapping = true;
+            RelationalModel.CreateSqlQueryColumnMapping(idSqlQueryColumn, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(discriminatorSqlQueryColumn, principalDerived.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(enum1SqlQueryColumn, principalDerived.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(enum2SqlQueryColumn, principalDerived.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(flagsEnum1SqlQueryColumn, principalDerived.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(flagsEnum2SqlQueryColumn, principalDerived.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(principalBaseIdSqlQueryColumn, principalDerived.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeArraySqlQueryColumn, principalDerived.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeEnumerableSqlQueryColumn, principalDerived.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeIListSqlQueryColumn, principalDerived.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeListSqlQueryColumn, principalDerived.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeArraySqlQueryColumn, principalDerived.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeEnumerableSqlQueryColumn, principalDerived.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeIListSqlQueryColumn, principalDerived.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeListSqlQueryColumn, principalDerived.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+
+            var deleteSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:DeleteStoredProcedureMappings", deleteSprocMappings0);
+            var principalBase_DeleteSprocMapping0 = new StoredProcedureMapping(principalDerived, principalBase_DeleteStoreSproc, principalBase_DeleteDSproc, principalBaseTableMapping2, null);
+            principalBase_DeleteStoreSproc.AddTypeMapping(principalBase_DeleteSprocMapping0, false);
+            deleteSprocMappings0.Add(principalBase_DeleteSprocMapping0);
+            principalBaseTableMapping2.DeleteStoredProcedureMapping = principalBase_DeleteSprocMapping0;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter, principalBase_DeleteDSproc.FindParameter("Id_Original")!, principalDerived.FindProperty("Id")!, principalBase_DeleteSprocMapping0);
+
+            var insertSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:InsertStoredProcedureMappings", insertSprocMappings0);
+            var principalBase_InsertSprocMapping0 = new StoredProcedureMapping(principalDerived, principalBase_InsertStoreSproc, principalBase_InsertISproc, principalBaseTableMapping2, null);
+            principalBase_InsertStoreSproc.AddTypeMapping(principalBase_InsertSprocMapping0, false);
+            insertSprocMappings0.Add(principalBase_InsertSprocMapping0);
+            principalBaseTableMapping2.InsertStoredProcedureMapping = principalBase_InsertSprocMapping0;
+            RelationalModel.CreateStoredProcedureParameterMapping(idParameter, principalBase_InsertISproc.FindParameter("Id")!, principalDerived.FindProperty("Id")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(discriminatorParameter, principalBase_InsertISproc.FindParameter("Discriminator")!, principalDerived.FindProperty("Discriminator")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter, principalBase_InsertISproc.FindParameter("Enum1")!, principalDerived.FindProperty("Enum1")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter, principalBase_InsertISproc.FindParameter("Enum2")!, principalDerived.FindProperty("Enum2")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum1")!, principalDerived.FindProperty("FlagsEnum1")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum2")!, principalDerived.FindProperty("FlagsEnum2")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter, principalBase_InsertISproc.FindParameter("PrincipalBaseId")!, principalDerived.FindProperty("PrincipalBaseId")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter, principalBase_InsertISproc.FindParameter("RefTypeArray")!, principalDerived.FindProperty("RefTypeArray")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("RefTypeEnumerable")!, principalDerived.FindProperty("RefTypeEnumerable")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter, principalBase_InsertISproc.FindParameter("RefTypeIList")!, principalDerived.FindProperty("RefTypeIList")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter, principalBase_InsertISproc.FindParameter("RefTypeList")!, principalDerived.FindProperty("RefTypeList")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter, principalBase_InsertISproc.FindParameter("ValueTypeArray")!, principalDerived.FindProperty("ValueTypeArray")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("ValueTypeEnumerable")!, principalDerived.FindProperty("ValueTypeEnumerable")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter, principalBase_InsertISproc.FindParameter("ValueTypeIList")!, principalDerived.FindProperty("ValueTypeIList")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter, principalBase_InsertISproc.FindParameter("ValueTypeList")!, principalDerived.FindProperty("ValueTypeList")!, principalBase_InsertSprocMapping0);
+
+            var updateSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:UpdateStoredProcedureMappings", updateSprocMappings0);
+            var principalBase_UpdateSprocMapping0 = new StoredProcedureMapping(principalDerived, principalBase_UpdateStoreSproc, principalBase_UpdateUSproc, principalBaseTableMapping2, null);
+            principalBase_UpdateStoreSproc.AddTypeMapping(principalBase_UpdateSprocMapping0, false);
+            updateSprocMappings0.Add(principalBase_UpdateSprocMapping0);
+            principalBaseTableMapping2.UpdateStoredProcedureMapping = principalBase_UpdateSprocMapping0;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter0, principalBase_UpdateUSproc.FindParameter("Id_Original")!, principalDerived.FindProperty("Id")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter0, principalBase_UpdateUSproc.FindParameter("Enum1")!, principalDerived.FindProperty("Enum1")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter0, principalBase_UpdateUSproc.FindParameter("Enum2")!, principalDerived.FindProperty("Enum2")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum1")!, principalDerived.FindProperty("FlagsEnum1")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum2")!, principalDerived.FindProperty("FlagsEnum2")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter0, principalBase_UpdateUSproc.FindParameter("PrincipalBaseId")!, principalDerived.FindProperty("PrincipalBaseId")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeArray")!, principalDerived.FindProperty("RefTypeArray")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeEnumerable")!, principalDerived.FindProperty("RefTypeEnumerable")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeIList")!, principalDerived.FindProperty("RefTypeIList")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeList")!, principalDerived.FindProperty("RefTypeList")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeArray")!, principalDerived.FindProperty("ValueTypeArray")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeEnumerable")!, principalDerived.FindProperty("ValueTypeEnumerable")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeIList")!, principalDerived.FindProperty("ValueTypeIList")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeList")!, principalDerived.FindProperty("ValueTypeList")!, principalBase_UpdateSprocMapping0);
+
+            var ownedCollection = principalDerived.FindComplexProperty("ManyOwned")!.ComplexType;
+
+            var defaultTableMappings3 = new List<TableMappingBase<ColumnMappingBase>>();
+            ownedCollection.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings3);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3 = new TableMappingBase<ColumnMappingBase>(ownedCollection, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3, null);
+            defaultTableMappings3.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_DetailsColumnBase, ownedCollection.FindProperty("Details")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_NumberColumnBase, ownedCollection.FindProperty("Number")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_RefTypeArrayColumnBase, ownedCollection.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_RefTypeEnumerableColumnBase, ownedCollection.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_RefTypeIListColumnBase, ownedCollection.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_RefTypeListColumnBase, ownedCollection.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_ValueTypeArrayColumnBase, ownedCollection.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_ValueTypeEnumerableColumnBase, ownedCollection.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_ValueTypeIListColumnBase, ownedCollection.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_ValueTypeListColumnBase, ownedCollection.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase3);
+
+            var tableMappings3 = new List<TableMapping>();
+            ownedCollection.SetRuntimeAnnotation("Relational:TableMappings", tableMappings3);
+            var principalBaseTableMapping3 = new TableMapping(ownedCollection, principalBaseTable, true);
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping3, null);
+            tableMappings3.Add(principalBaseTableMapping3);
+
+            var principalBase1 = ownedCollection.FindComplexProperty("Principal")!.ComplexType;
+
+            var defaultTableMappings4 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase1.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings4);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4 = new TableMappingBase<ColumnMappingBase>(principalBase1, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4, null);
+            defaultTableMappings4.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_AlternateIdColumnBase, principalBase1.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_Enum1ColumnBase, principalBase1.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_Enum2ColumnBase, principalBase1.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_FlagsEnum1ColumnBase, principalBase1.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_FlagsEnum2ColumnBase, principalBase1.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_IdColumnBase, principalBase1.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_RefTypeArrayColumnBase, principalBase1.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_RefTypeEnumerableColumnBase, principalBase1.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_RefTypeIListColumnBase, principalBase1.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_RefTypeListColumnBase, principalBase1.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_ValueTypeArrayColumnBase, principalBase1.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_ValueTypeEnumerableColumnBase, principalBase1.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_ValueTypeIListColumnBase, principalBase1.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)manyOwned_Principal_ValueTypeListColumnBase, principalBase1.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase4);
+
+            var tableMappings4 = new List<TableMapping>();
+            principalBase1.SetRuntimeAnnotation("Relational:TableMappings", tableMappings4);
+            var principalBaseTableMapping4 = new TableMapping(principalBase1, principalBaseTable, true);
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping4, null);
+            tableMappings4.Add(principalBaseTableMapping4);
+            var fK_PrincipalBase_PrincipalBase_PrincipalBaseId = new ForeignKeyConstraint(
+                "FK_PrincipalBase_PrincipalBase_PrincipalBaseId", principalBaseTable, principalBaseTable,
+                new[] { principalBaseIdColumn },
+                principalBaseTable.FindUniqueConstraint("PK_PrincipalBase")!, ReferentialAction.NoAction);
+            fK_PrincipalBase_PrincipalBase_PrincipalBaseId.SetRowForeignKeyValueFactory(RowForeignKeyValueFactoryFactory.CreateSimpleNonNullableFactory<long, long>(fK_PrincipalBase_PrincipalBase_PrincipalBaseId));
+            var fK_PrincipalBase_PrincipalBase_PrincipalBaseIdFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalBaseId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            fK_PrincipalBase_PrincipalBase_PrincipalBaseId.MappedForeignKeys.Add(fK_PrincipalBase_PrincipalBase_PrincipalBaseIdFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBase_PrincipalBase_PrincipalBaseIdFk).Add(fK_PrincipalBase_PrincipalBase_PrincipalBaseId);
+            principalBaseTable.ForeignKeyConstraints.Add(fK_PrincipalBase_PrincipalBase_PrincipalBaseId);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBase_PrincipalBase_PrincipalBaseId);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/OwnedTypeUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/OwnedTypeUnsafeAccessors.cs
new file mode 100644
index 00000000..9bbed4ed
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/OwnedTypeUnsafeAccessors.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class OwnedTypeUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_details")]
+        public static extern ref string _details(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Number>k__BackingField")]
+        public static extern ref int Number(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeArray")]
+        public static extern ref IPAddress[] _refTypeArray(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeEnumerable")]
+        public static extern ref IEnumerable<string> _refTypeEnumerable(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeIList")]
+        public static extern ref IList<string> _refTypeIList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_refTypeList")]
+        public static extern ref List<IPAddress> _refTypeList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_valueTypeArray")]
+        public static extern ref DateTime[] _valueTypeArray(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_valueTypeEnumerable")]
+        public static extern ref IEnumerable<byte> _valueTypeEnumerable(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeIList>k__BackingField")]
+        public static extern ref IList<byte> ValueTypeIList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_valueTypeList")]
+        public static extern ref List<short> _valueTypeList(CompiledModelTestBase.OwnedType @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Principal>k__BackingField")]
+        public static extern ref CompiledModelTestBase.PrincipalBase Principal(CompiledModelTestBase.OwnedType @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs
new file mode 100644
index 00000000..860bd05e
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs
@@ -0,0 +1,3261 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.ValueGeneration;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                typeof(CompiledModelTestBase.PrincipalBase),
+                baseEntityType,
+                discriminatorProperty: "Discriminator",
+                discriminatorValue: "PrincipalBase",
+                derivedTypesCount: 1,
+                propertyCount: 15,
+                complexPropertyCount: 1,
+                navigationCount: 1,
+                foreignKeyCount: 1,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            id.SetGetter(
+                long? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Id(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Id(instance).HasValue));
+            id.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                long? (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<long?>(0) : (entry.FlaggedAsTemporary(0) && !(PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))).HasValue) ? entry.ReadTemporaryValue<long?>(0) : PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                long? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(id, 0),
+                long? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long?>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            id.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<long?>(id));
+            id.SetComparer(new NullableValueComparer<long>(id.TypeMapping.Comparer));
+            id.SetKeyComparer(new NullableValueComparer<long>(id.TypeMapping.KeyComparer));
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var discriminator = runtimeEntityType.AddProperty(
+                "Discriminator",
+                typeof(string),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 55,
+                valueGeneratorFactory: new DiscriminatorValueGeneratorFactory().Create);
+            discriminator.SetAccessors(
+                string (IInternalEntry entry) => entry.ReadShadowValue<string>(0),
+                string (IInternalEntry entry) => entry.ReadShadowValue<string>(0),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(discriminator, 1),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(discriminator));
+            discriminator.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: 0,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            discriminator.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(55)",
+                    size: 55));
+
+            var enum1 = runtimeEntityType.AddProperty(
+                "Enum1",
+                typeof(CompiledModelTestBase.AnEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum1.SetGetter(
+                CompiledModelTestBase.AnEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum1(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.Enum1(instance))), ((object)((CompiledModelTestBase.AnEnum)0L))));
+            enum1.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                    return instance;
+                });
+            enum1.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                    return instance;
+                });
+            enum1.SetAccessors(
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum>(enum1, 2),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1));
+            enum1.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                    CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                        CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+            enum1.SetSentinelFromProviderValue(0);
+
+            var enum2 = runtimeEntityType.AddProperty(
+                "Enum2",
+                typeof(CompiledModelTestBase.AnEnum?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            enum2.SetGetter(
+                CompiledModelTestBase.AnEnum? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum2(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Enum2(instance).HasValue));
+            enum2.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                    return instance;
+                });
+            enum2.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                    return instance;
+                });
+            enum2.SetAccessors(
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum?>(enum2, 3),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2));
+            enum2.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                    CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                        CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+            enum2.SetComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.Comparer));
+            enum2.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.KeyComparer));
+
+            var flagsEnum1 = runtimeEntityType.AddProperty(
+                "FlagsEnum1",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum1.SetGetter(
+                CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum1(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum1(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+            flagsEnum1.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                    return instance;
+                });
+            flagsEnum1.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                    return instance;
+                });
+            flagsEnum1.SetAccessors(
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1, 4),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1));
+            flagsEnum1.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            flagsEnum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                    CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                        CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+            flagsEnum1.SetSentinelFromProviderValue(0);
+
+            var flagsEnum2 = runtimeEntityType.AddProperty(
+                "FlagsEnum2",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum2.SetGetter(
+                CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum2(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum2(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+            flagsEnum2.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum2(instance) = value;
+                    return instance;
+                });
+            flagsEnum2.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum2(instance) = value;
+                    return instance;
+                });
+            flagsEnum2.SetAccessors(
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2, 5),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2));
+            flagsEnum2.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            flagsEnum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                    CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                        CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+            flagsEnum2.SetSentinelFromProviderValue(0);
+
+            var principalBaseId = runtimeEntityType.AddProperty(
+                "PrincipalBaseId",
+                typeof(long?),
+                nullable: true);
+            principalBaseId.SetAccessors(
+                long? (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(6) ? entry.ReadStoreGeneratedValue<long?>(1) : (entry.FlaggedAsTemporary(6) && !(entry.ReadShadowValue<long?>(1).HasValue) ? entry.ReadTemporaryValue<long?>(1) : entry.ReadShadowValue<long?>(1))),
+                long? (IInternalEntry entry) => entry.ReadShadowValue<long?>(1),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(principalBaseId, 6),
+                long? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long?>(principalBaseId, 1));
+            principalBaseId.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: 1,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            principalBaseId.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            principalBaseId.SetCurrentValueComparer(new EntryCurrentValueComparer<long?>(principalBaseId));
+            principalBaseId.SetComparer(new NullableValueComparer<long>(principalBaseId.TypeMapping.Comparer));
+            principalBaseId.SetKeyComparer(new NullableValueComparer<long>(principalBaseId.TypeMapping.KeyComparer));
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance) == null);
+            refTypeArray.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 7),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+            refTypeArray.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+            refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.SetGetter(
+                IEnumerable<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) == null);
+            refTypeEnumerable.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetAccessors(
+                IEnumerable<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 8),
+                IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+            refTypeEnumerable.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+            refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.SetGetter(
+                IList<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance) == null);
+            refTypeIList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetAccessors(
+                IList<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 9),
+                IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+            refTypeIList.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+            refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.SetGetter(
+                List<IPAddress> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance) == null);
+            refTypeList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetAccessors(
+                List<IPAddress> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 10),
+                List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+            refTypeList.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+            refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) == null);
+            valueTypeArray.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 11),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+            valueTypeArray.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+            valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.SetGetter(
+                IEnumerable<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) == null);
+            valueTypeEnumerable.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetAccessors(
+                IEnumerable<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 12),
+                IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+            valueTypeEnumerable.SetPropertyIndexes(
+                index: 12,
+                originalValueIndex: 12,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+            valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.SetGetter(
+                IList<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) == null);
+            valueTypeIList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetAccessors(
+                IList<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 13),
+                IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+            valueTypeIList.SetPropertyIndexes(
+                index: 13,
+                originalValueIndex: 13,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+            valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.SetGetter(
+                List<short> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance) == null);
+            valueTypeList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetAccessors(
+                List<short> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<short> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 14),
+                List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+            valueTypeList.SetPropertyIndexes(
+                index: 14,
+                originalValueIndex: 14,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+            valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+            OwnedComplexProperty.Create(runtimeEntityType);
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalBaseId });
+
+            return runtimeEntityType;
+        }
+
+        public static class OwnedComplexProperty
+        {
+            public static RuntimeComplexProperty Create(RuntimeEntityType declaringType)
+            {
+                var complexProperty = declaringType.AddComplexProperty("Owned",
+                    typeof(CompiledModelTestBase.OwnedType),
+                    "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                    typeof(CompiledModelTestBase.OwnedType),
+                    propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Owned", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("_ownedField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    propertyAccessMode: PropertyAccessMode.Field,
+                    changeTrackingStrategy: ChangeTrackingStrategy.ChangingAndChangedNotificationsWithOriginalValues,
+                    propertyCount: 10,
+                    complexPropertyCount: 1);
+
+                var complexType = complexProperty.ComplexType;
+                complexProperty.SetGetter(
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors._ownedField(instance),
+                    bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors._ownedField(instance) == null);
+                complexProperty.SetSetter(
+                    CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.OwnedType value) =>
+                    {
+                        PrincipalBaseUnsafeAccessors._ownedField(instance) = value;
+                        return instance;
+                    });
+                complexProperty.SetMaterializationSetter(
+                    CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.OwnedType value) =>
+                    {
+                        PrincipalBaseUnsafeAccessors._ownedField(instance) = value;
+                        return instance;
+                    });
+                complexProperty.SetAccessors(
+                    CompiledModelTestBase.OwnedType (IInternalEntry entry) => PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                    CompiledModelTestBase.OwnedType (IInternalEntry entry) => PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                    null,
+                    CompiledModelTestBase.OwnedType (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.OwnedType>(complexProperty));
+                complexProperty.SetPropertyIndexes(
+                    index: 0,
+                    originalValueIndex: -1,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                var details = complexType.AddProperty(
+                    "Details",
+                    typeof(string),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    propertyAccessMode: PropertyAccessMode.FieldDuringConstruction,
+                    nullable: true,
+                    concurrencyToken: true,
+                    valueGenerated: ValueGenerated.OnAddOrUpdate,
+                    beforeSaveBehavior: PropertySaveBehavior.Ignore,
+                    afterSaveBehavior: PropertySaveBehavior.Ignore,
+                    maxLength: 64,
+                    unicode: false,
+                    precision: 3,
+                    scale: 2,
+                    sentinel: "");
+                details.SetGetter(
+                    string (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(string) : PrincipalBaseUnsafeAccessors._ownedField(entity).Details),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => !((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(string) : PrincipalBaseUnsafeAccessors._ownedField(entity).Details) == null) && (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(string) : PrincipalBaseUnsafeAccessors._ownedField(entity).Details) == "",
+                    string (CompiledModelTestBase.OwnedType instance) => instance.Details,
+                    bool (CompiledModelTestBase.OwnedType instance) => !(instance.Details == null) && instance.Details == "");
+                details.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, string value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        level1.Details = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                    {
+                        instance.Details = value;
+                        return instance;
+                    });
+                details.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, string value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        level1.Details = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._details(instance) = value;
+                        return instance;
+                    });
+                details.SetAccessors(
+                    string (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(15) ? entry.ReadStoreGeneratedValue<string>(2) : (entry.FlaggedAsTemporary(15) && !((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(string) : PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))).Details) == null) && (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(string) : PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))).Details) == "" ? entry.ReadTemporaryValue<string>(2) : (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(string) : PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))).Details))),
+                    string (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(string) : PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))).Details),
+                    string (IInternalEntry entry) => entry.ReadOriginalValue<string>(details, 15),
+                    string (IInternalEntry entry) => entry.GetCurrentValue<string>(details));
+                details.SetPropertyIndexes(
+                    index: 15,
+                    originalValueIndex: 15,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: 2);
+                details.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(64)",
+                        size: 64,
+                        unicode: false,
+                        precision: 3,
+                        scale: 2));
+                details.AddAnnotation("foo", "bar");
+                details.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+                details.AddAnnotation("Relational:ColumnName", "Deets");
+                details.AddAnnotation("Relational:ColumnType", "varchar");
+
+                var number = complexType.AddProperty(
+                    "Number",
+                    typeof(int),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    sentinel: 0);
+                number.SetGetter(
+                    int (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(int) : OwnedTypeUnsafeAccessors.Number(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(int) : OwnedTypeUnsafeAccessors.Number(PrincipalBaseUnsafeAccessors._ownedField(entity))) == 0,
+                    int (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance) == 0);
+                number.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, int value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors.Number(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                    {
+                        OwnedTypeUnsafeAccessors.Number(instance) = value;
+                        return instance;
+                    });
+                number.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, int value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors.Number(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                    {
+                        OwnedTypeUnsafeAccessors.Number(instance) = value;
+                        return instance;
+                    });
+                number.SetAccessors(
+                    int (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(int) : OwnedTypeUnsafeAccessors.Number(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    int (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(int) : OwnedTypeUnsafeAccessors.Number(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    int (IInternalEntry entry) => entry.ReadOriginalValue<int>(number, 16),
+                    int (IInternalEntry entry) => entry.GetCurrentValue<int>(number));
+                number.SetPropertyIndexes(
+                    index: 16,
+                    originalValueIndex: 16,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                number.TypeMapping = JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v));
+                number.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                var refTypeArray = complexType.AddProperty(
+                    "RefTypeArray",
+                    typeof(IPAddress[]),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeArray.SetGetter(
+                    IPAddress[] (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IPAddress[]) : OwnedTypeUnsafeAccessors._refTypeArray(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IPAddress[]) : OwnedTypeUnsafeAccessors._refTypeArray(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null,
+                    IPAddress[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance) == null);
+                refTypeArray.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IPAddress[] value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._refTypeArray(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                        return instance;
+                    });
+                refTypeArray.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IPAddress[] value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._refTypeArray(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                        return instance;
+                    });
+                refTypeArray.SetAccessors(
+                    IPAddress[] (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IPAddress[]) : OwnedTypeUnsafeAccessors._refTypeArray(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IPAddress[] (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IPAddress[]) : OwnedTypeUnsafeAccessors._refTypeArray(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 17),
+                    IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+                refTypeArray.SetPropertyIndexes(
+                    index: 17,
+                    originalValueIndex: 17,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v)),
+                    keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v))))),
+                    jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)))),
+                    elementMapping: JetStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v),
+                        keyComparer: new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(45)",
+                            size: 45),
+                        converter: new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)))));
+                var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+                refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+                refTypeArray.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                var refTypeEnumerable = complexType.AddProperty(
+                    "RefTypeEnumerable",
+                    typeof(IEnumerable<string>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeEnumerable.SetGetter(
+                    IEnumerable<string> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IEnumerable<string>) : OwnedTypeUnsafeAccessors._refTypeEnumerable(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IEnumerable<string>) : OwnedTypeUnsafeAccessors._refTypeEnumerable(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null,
+                    IEnumerable<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) == null);
+                refTypeEnumerable.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IEnumerable<string> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._refTypeEnumerable(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                        return instance;
+                    });
+                refTypeEnumerable.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IEnumerable<string> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._refTypeEnumerable(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                        return instance;
+                    });
+                refTypeEnumerable.SetAccessors(
+                    IEnumerable<string> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IEnumerable<string>) : OwnedTypeUnsafeAccessors._refTypeEnumerable(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IEnumerable<string> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IEnumerable<string>) : OwnedTypeUnsafeAccessors._refTypeEnumerable(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 18),
+                    IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+                refTypeEnumerable.SetPropertyIndexes(
+                    index: 18,
+                    originalValueIndex: 18,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v)),
+                    keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                        JsonStringReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                        JsonStringReaderWriter.Instance),
+                    elementMapping: JetStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        keyComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255)));
+                var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+                refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+                refTypeEnumerable.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                var refTypeIList = complexType.AddProperty(
+                    "RefTypeIList",
+                    typeof(IList<string>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeIList.SetGetter(
+                    IList<string> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IList<string>) : OwnedTypeUnsafeAccessors._refTypeIList(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IList<string>) : OwnedTypeUnsafeAccessors._refTypeIList(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null,
+                    IList<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance) == null);
+                refTypeIList.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IList<string> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._refTypeIList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                        return instance;
+                    });
+                refTypeIList.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IList<string> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._refTypeIList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                        return instance;
+                    });
+                refTypeIList.SetAccessors(
+                    IList<string> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IList<string>) : OwnedTypeUnsafeAccessors._refTypeIList(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IList<string> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IList<string>) : OwnedTypeUnsafeAccessors._refTypeIList(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 19),
+                    IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+                refTypeIList.SetPropertyIndexes(
+                    index: 19,
+                    originalValueIndex: 19,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v)),
+                    keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                        JsonStringReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                        JsonStringReaderWriter.Instance),
+                    elementMapping: JetStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        keyComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255)));
+                var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+                refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+                refTypeIList.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                var refTypeList = complexType.AddProperty(
+                    "RefTypeList",
+                    typeof(List<IPAddress>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeList.SetGetter(
+                    List<IPAddress> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(List<IPAddress>) : OwnedTypeUnsafeAccessors._refTypeList(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(List<IPAddress>) : OwnedTypeUnsafeAccessors._refTypeList(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null,
+                    List<IPAddress> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance) == null);
+                refTypeList.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, List<IPAddress> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._refTypeList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                        return instance;
+                    });
+                refTypeList.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, List<IPAddress> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._refTypeList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                        return instance;
+                    });
+                refTypeList.SetAccessors(
+                    List<IPAddress> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(List<IPAddress>) : OwnedTypeUnsafeAccessors._refTypeList(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    List<IPAddress> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(List<IPAddress>) : OwnedTypeUnsafeAccessors._refTypeList(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 20),
+                    List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+                refTypeList.SetPropertyIndexes(
+                    index: 20,
+                    originalValueIndex: 20,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v)),
+                    keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v))))),
+                    jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)))),
+                    elementMapping: JetStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v),
+                        keyComparer: new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(45)",
+                            size: 45),
+                        converter: new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)))));
+                var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+                refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+                refTypeList.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                var valueTypeArray = complexType.AddProperty(
+                    "ValueTypeArray",
+                    typeof(DateTime[]),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeArray.SetGetter(
+                    DateTime[] (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(DateTime[]) : OwnedTypeUnsafeAccessors._valueTypeArray(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(DateTime[]) : OwnedTypeUnsafeAccessors._valueTypeArray(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null,
+                    DateTime[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance) == null);
+                valueTypeArray.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, DateTime[] value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._valueTypeArray(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                        return instance;
+                    });
+                valueTypeArray.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, DateTime[] value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._valueTypeArray(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                        return instance;
+                    });
+                valueTypeArray.SetAccessors(
+                    DateTime[] (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(DateTime[]) : OwnedTypeUnsafeAccessors._valueTypeArray(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    DateTime[] (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(DateTime[]) : OwnedTypeUnsafeAccessors._valueTypeArray(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 21),
+                    DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+                valueTypeArray.SetPropertyIndexes(
+                    index: 21,
+                    originalValueIndex: 21,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)),
+                    keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                        JsonDateTimeReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                        JsonDateTimeReaderWriter.Instance),
+                    elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v),
+                        keyComparer: new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v),
+                        providerValueComparer: new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v)));
+                var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+                valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+                valueTypeArray.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                var valueTypeEnumerable = complexType.AddProperty(
+                    "ValueTypeEnumerable",
+                    typeof(IEnumerable<byte>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeEnumerable.SetGetter(
+                    IEnumerable<byte> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IEnumerable<byte>) : OwnedTypeUnsafeAccessors._valueTypeEnumerable(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IEnumerable<byte>) : OwnedTypeUnsafeAccessors._valueTypeEnumerable(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null,
+                    IEnumerable<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) == null);
+                valueTypeEnumerable.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IEnumerable<byte> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._valueTypeEnumerable(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                        return instance;
+                    });
+                valueTypeEnumerable.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IEnumerable<byte> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._valueTypeEnumerable(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                        return instance;
+                    });
+                valueTypeEnumerable.SetAccessors(
+                    IEnumerable<byte> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IEnumerable<byte>) : OwnedTypeUnsafeAccessors._valueTypeEnumerable(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IEnumerable<byte> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IEnumerable<byte>) : OwnedTypeUnsafeAccessors._valueTypeEnumerable(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 22),
+                    IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+                valueTypeEnumerable.SetPropertyIndexes(
+                    index: 22,
+                    originalValueIndex: 22,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)),
+                    keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                        JsonByteReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                        JsonByteReaderWriter.Instance),
+                    elementMapping: JetByteTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v),
+                        keyComparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v),
+                        providerValueComparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)));
+                var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+                valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+                valueTypeEnumerable.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                var valueTypeIList = complexType.AddProperty(
+                    "ValueTypeIList",
+                    typeof(IList<byte>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeIList.SetGetter(
+                    IList<byte> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IList<byte>) : OwnedTypeUnsafeAccessors.ValueTypeIList(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(IList<byte>) : OwnedTypeUnsafeAccessors.ValueTypeIList(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null,
+                    IList<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance) == null);
+                valueTypeIList.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IList<byte> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors.ValueTypeIList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                        return instance;
+                    });
+                valueTypeIList.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IList<byte> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors.ValueTypeIList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                        return instance;
+                    });
+                valueTypeIList.SetAccessors(
+                    IList<byte> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IList<byte>) : OwnedTypeUnsafeAccessors.ValueTypeIList(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IList<byte> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(IList<byte>) : OwnedTypeUnsafeAccessors.ValueTypeIList(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 23),
+                    IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+                valueTypeIList.SetPropertyIndexes(
+                    index: 23,
+                    originalValueIndex: 23,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)),
+                    keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                        JsonByteReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                        JsonByteReaderWriter.Instance),
+                    elementMapping: JetByteTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v),
+                        keyComparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v),
+                        providerValueComparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)));
+                var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+                valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+                valueTypeIList.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                var valueTypeList = complexType.AddProperty(
+                    "ValueTypeList",
+                    typeof(List<short>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeList.SetGetter(
+                    List<short> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(List<short>) : OwnedTypeUnsafeAccessors._valueTypeList(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                    bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(List<short>) : OwnedTypeUnsafeAccessors._valueTypeList(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null,
+                    List<short> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance) == null);
+                valueTypeList.SetSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, List<short> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._valueTypeList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                        return instance;
+                    });
+                valueTypeList.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, List<short> value) =>
+                    {
+                        var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                        OwnedTypeUnsafeAccessors._valueTypeList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                        return instance;
+                    });
+                valueTypeList.SetAccessors(
+                    List<short> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(List<short>) : OwnedTypeUnsafeAccessors._valueTypeList(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    List<short> (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(List<short>) : OwnedTypeUnsafeAccessors._valueTypeList(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                    List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 24),
+                    List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+                valueTypeList.SetPropertyIndexes(
+                    index: 24,
+                    originalValueIndex: 24,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)),
+                    keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                        JsonInt16ReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                        JsonInt16ReaderWriter.Instance),
+                    elementMapping: ShortTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v),
+                        keyComparer: new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v),
+                        providerValueComparer: new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v)));
+                var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+                valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+                valueTypeList.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                PrincipalComplexProperty.Create(complexType);
+                complexType.AddAnnotation("go", "brr");
+                complexType.AddAnnotation("Relational:FunctionName", "PrincipalBaseTvf");
+                complexType.AddAnnotation("Relational:Schema", null);
+                complexType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+                complexType.AddAnnotation("Relational:TableName", "PrincipalBase");
+                complexType.AddAnnotation("Relational:ViewName", "PrincipalBaseView");
+                complexType.AddAnnotation("Relational:ViewSchema", null);
+                complexProperty.AddAnnotation("goo", "ber");
+                return complexProperty;
+            }
+
+            public static class PrincipalComplexProperty
+            {
+                public static RuntimeComplexProperty Create(RuntimeComplexType declaringType)
+                {
+                    var complexProperty = declaringType.AddComplexProperty("Principal",
+                        typeof(CompiledModelTestBase.PrincipalBase),
+                        "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType.Principal#PrincipalBase",
+                        typeof(CompiledModelTestBase.PrincipalBase),
+                        propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Principal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Principal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true,
+                        propertyCount: 14);
+
+                    var complexType = complexProperty.ComplexType;
+                    complexProperty.SetGetter(
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null,
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Principal(instance),
+                        bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Principal(instance) == null);
+                    complexProperty.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.PrincipalBase value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            OwnedTypeUnsafeAccessors.Principal(level1) = value;
+                        },
+                        CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, CompiledModelTestBase.PrincipalBase value) =>
+                        {
+                            OwnedTypeUnsafeAccessors.Principal(instance) = value;
+                            return instance;
+                        });
+                    complexProperty.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.PrincipalBase value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            OwnedTypeUnsafeAccessors.Principal(level1) = value;
+                        },
+                        CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, CompiledModelTestBase.PrincipalBase value) =>
+                        {
+                            OwnedTypeUnsafeAccessors.Principal(instance) = value;
+                            return instance;
+                        });
+                    complexProperty.SetAccessors(
+                        CompiledModelTestBase.PrincipalBase (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                        CompiledModelTestBase.PrincipalBase (IInternalEntry entry) => (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                        null,
+                        CompiledModelTestBase.PrincipalBase (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.PrincipalBase>(complexProperty));
+                    complexProperty.SetPropertyIndexes(
+                        index: 1,
+                        originalValueIndex: 25,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    var alternateId = complexType.AddProperty(
+                        "AlternateId",
+                        typeof(Guid),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("AlternateId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+                    alternateId.SetGetter(
+                        Guid (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(Guid) : (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))).AlternateId),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(Guid) : (PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))).AlternateId) == new Guid("00000000-0000-0000-0000-000000000000"),
+                        Guid (CompiledModelTestBase.PrincipalBase instance) => instance.AlternateId,
+                        bool (CompiledModelTestBase.PrincipalBase instance) => instance.AlternateId == new Guid("00000000-0000-0000-0000-000000000000"));
+                    alternateId.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, Guid value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            level2.AlternateId = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, Guid value) =>
+                        {
+                            instance.AlternateId = value;
+                            return instance;
+                        });
+                    alternateId.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, Guid value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            level2.AlternateId = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, Guid value) =>
+                        {
+                            instance.AlternateId = value;
+                            return instance;
+                        });
+                    alternateId.SetAccessors(
+                        Guid (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(Guid) : (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))).AlternateId),
+                        Guid (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(Guid) : (PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))).AlternateId),
+                        Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(alternateId, 26),
+                        Guid (IInternalEntry entry) => entry.GetCurrentValue<Guid>(alternateId));
+                    alternateId.SetPropertyIndexes(
+                        index: 25,
+                        originalValueIndex: 26,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    alternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<Guid>(
+                            bool (Guid v1, Guid v2) => v1 == v2,
+                            int (Guid v) => ((object)v).GetHashCode(),
+                            Guid (Guid v) => v),
+                        keyComparer: new ValueComparer<Guid>(
+                            bool (Guid v1, Guid v2) => v1 == v2,
+                            int (Guid v) => ((object)v).GetHashCode(),
+                            Guid (Guid v) => v),
+                        providerValueComparer: new ValueComparer<Guid>(
+                            bool (Guid v1, Guid v2) => v1 == v2,
+                            int (Guid v) => ((object)v).GetHashCode(),
+                            Guid (Guid v) => v));
+                    alternateId.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var enum1 = complexType.AddProperty(
+                        "Enum1",
+                        typeof(CompiledModelTestBase.AnEnum),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+                    enum1.SetGetter(
+                        CompiledModelTestBase.AnEnum (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(CompiledModelTestBase.AnEnum) : PrincipalBaseUnsafeAccessors.Enum1((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => object.Equals(((object)(((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(CompiledModelTestBase.AnEnum) : PrincipalBaseUnsafeAccessors.Enum1((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))))), ((object)((CompiledModelTestBase.AnEnum)0L))),
+                        CompiledModelTestBase.AnEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum1(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.Enum1(instance))), ((object)((CompiledModelTestBase.AnEnum)0L))));
+                    enum1.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.AnEnum value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Enum1(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                            return instance;
+                        });
+                    enum1.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.AnEnum value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Enum1(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                            return instance;
+                        });
+                    enum1.SetAccessors(
+                        CompiledModelTestBase.AnEnum (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(CompiledModelTestBase.AnEnum) : PrincipalBaseUnsafeAccessors.Enum1((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        CompiledModelTestBase.AnEnum (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(CompiledModelTestBase.AnEnum) : PrincipalBaseUnsafeAccessors.Enum1((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum>(enum1, 27),
+                        CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1));
+                    enum1.SetPropertyIndexes(
+                        index: 26,
+                        originalValueIndex: 27,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    enum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            bool (int v1, int v2) => v1 == v2,
+                            int (int v) => v,
+                            int (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                            int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                            CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                                int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                                CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+                    enum1.SetSentinelFromProviderValue(0);
+                    enum1.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var enum2 = complexType.AddProperty(
+                        "Enum2",
+                        typeof(CompiledModelTestBase.AnEnum?),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    enum2.SetGetter(
+                        CompiledModelTestBase.AnEnum? (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(CompiledModelTestBase.AnEnum? ) : PrincipalBaseUnsafeAccessors.Enum2((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => !(((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(CompiledModelTestBase.AnEnum? ) : PrincipalBaseUnsafeAccessors.Enum2((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))).HasValue),
+                        CompiledModelTestBase.AnEnum? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum2(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Enum2(instance).HasValue));
+                    enum2.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.AnEnum? value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Enum2(level2) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                            return instance;
+                        });
+                    enum2.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.AnEnum? value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Enum2(level2) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                            return instance;
+                        });
+                    enum2.SetAccessors(
+                        CompiledModelTestBase.AnEnum? (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(CompiledModelTestBase.AnEnum? ) : PrincipalBaseUnsafeAccessors.Enum2((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        CompiledModelTestBase.AnEnum? (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(CompiledModelTestBase.AnEnum? ) : PrincipalBaseUnsafeAccessors.Enum2((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum?>(enum2, 28),
+                        CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2));
+                    enum2.SetPropertyIndexes(
+                        index: 27,
+                        originalValueIndex: 28,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    enum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            bool (int v1, int v2) => v1 == v2,
+                            int (int v) => v,
+                            int (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                            int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                            CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                                int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                                CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+                    enum2.SetComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.Comparer));
+                    enum2.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.KeyComparer));
+                    enum2.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var flagsEnum1 = complexType.AddProperty(
+                        "FlagsEnum1",
+                        typeof(CompiledModelTestBase.AFlagsEnum),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+                    flagsEnum1.SetGetter(
+                        CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum1((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => object.Equals(((object)(((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum1((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))),
+                        CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum1(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum1(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+                    flagsEnum1.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.FlagsEnum1(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                            return instance;
+                        });
+                    flagsEnum1.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.FlagsEnum1(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                            return instance;
+                        });
+                    flagsEnum1.SetAccessors(
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum1((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum1((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1, 29),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1));
+                    flagsEnum1.SetPropertyIndexes(
+                        index: 28,
+                        originalValueIndex: 29,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    flagsEnum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            bool (int v1, int v2) => v1 == v2,
+                            int (int v) => v,
+                            int (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                            int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                            CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                                int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                                CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+                    flagsEnum1.SetSentinelFromProviderValue(0);
+                    flagsEnum1.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var flagsEnum2 = complexType.AddProperty(
+                        "FlagsEnum2",
+                        typeof(CompiledModelTestBase.AFlagsEnum),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+                    flagsEnum2.SetGetter(
+                        CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum2((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => object.Equals(((object)(((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum2((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))),
+                        CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum2(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum2(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+                    flagsEnum2.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.FlagsEnum2(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.FlagsEnum2(instance) = value;
+                            return instance;
+                        });
+                    flagsEnum2.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.FlagsEnum2(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.FlagsEnum2(instance) = value;
+                            return instance;
+                        });
+                    flagsEnum2.SetAccessors(
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum2((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum2((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2, 30),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2));
+                    flagsEnum2.SetPropertyIndexes(
+                        index: 29,
+                        originalValueIndex: 30,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    flagsEnum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            bool (int v1, int v2) => v1 == v2,
+                            int (int v) => v,
+                            int (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                            int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                            CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                                int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                                CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+                    flagsEnum2.SetSentinelFromProviderValue(0);
+                    flagsEnum2.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var id = complexType.AddProperty(
+                        "Id",
+                        typeof(long?),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    id.SetGetter(
+                        long? (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(long? ) : PrincipalBaseUnsafeAccessors.Id((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => !(((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(long? ) : PrincipalBaseUnsafeAccessors.Id((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))).HasValue),
+                        long? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Id(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Id(instance).HasValue));
+                    id.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, long? value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Id(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                            return instance;
+                        });
+                    id.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, long? value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Id(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                            return instance;
+                        });
+                    id.SetAccessors(
+                        long? (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(long? ) : PrincipalBaseUnsafeAccessors.Id((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        long? (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(long? ) : PrincipalBaseUnsafeAccessors.Id((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(id, 31),
+                        long? (IInternalEntry entry) => entry.GetCurrentValue<long?>(id));
+                    id.SetPropertyIndexes(
+                        index: 30,
+                        originalValueIndex: 31,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    id.TypeMapping = JetLongTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<long>(
+                            bool (long v1, long v2) => v1 == v2,
+                            int (long v) => ((object)v).GetHashCode(),
+                            long (long v) => v),
+                        keyComparer: new ValueComparer<long>(
+                            bool (long v1, long v2) => v1 == v2,
+                            int (long v) => ((object)v).GetHashCode(),
+                            long (long v) => v),
+                        providerValueComparer: new ValueComparer<long>(
+                            bool (long v1, long v2) => v1 == v2,
+                            int (long v) => ((object)v).GetHashCode(),
+                            long (long v) => v));
+                    id.SetComparer(new NullableValueComparer<long>(id.TypeMapping.Comparer));
+                    id.SetKeyComparer(new NullableValueComparer<long>(id.TypeMapping.KeyComparer));
+                    id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var refTypeArray = complexType.AddProperty(
+                        "RefTypeArray",
+                        typeof(IPAddress[]),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeArray.SetGetter(
+                        IPAddress[] (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IPAddress[]) : PrincipalBaseUnsafeAccessors.RefTypeArray((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IPAddress[]) : PrincipalBaseUnsafeAccessors.RefTypeArray((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))) == null,
+                        IPAddress[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance) == null);
+                    refTypeArray.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IPAddress[] value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeArray(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                            return instance;
+                        });
+                    refTypeArray.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IPAddress[] value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeArray(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                            return instance;
+                        });
+                    refTypeArray.SetAccessors(
+                        IPAddress[] (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IPAddress[]) : PrincipalBaseUnsafeAccessors.RefTypeArray((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IPAddress[] (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IPAddress[]) : PrincipalBaseUnsafeAccessors.RefTypeArray((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 32),
+                        IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+                    refTypeArray.SetPropertyIndexes(
+                        index: 31,
+                        originalValueIndex: 32,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v)),
+                        keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v))))),
+                        jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v)))),
+                        elementMapping: JetStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<IPAddress>(
+                                bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                int (IPAddress v) => ((object)v).GetHashCode(),
+                                IPAddress (IPAddress v) => v),
+                            keyComparer: new ValueComparer<IPAddress>(
+                                bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                int (IPAddress v) => ((object)v).GetHashCode(),
+                                IPAddress (IPAddress v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(45)",
+                                size: 45),
+                            converter: new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)),
+                            jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v)))));
+                    var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+                    refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+                    refTypeArray.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var refTypeEnumerable = complexType.AddProperty(
+                        "RefTypeEnumerable",
+                        typeof(IEnumerable<string>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeEnumerable.SetGetter(
+                        IEnumerable<string> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IEnumerable<string>) : PrincipalBaseUnsafeAccessors.RefTypeEnumerable((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IEnumerable<string>) : PrincipalBaseUnsafeAccessors.RefTypeEnumerable((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))) == null,
+                        IEnumerable<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) == null);
+                    refTypeEnumerable.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IEnumerable<string> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeEnumerable(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                            return instance;
+                        });
+                    refTypeEnumerable.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IEnumerable<string> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeEnumerable(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                            return instance;
+                        });
+                    refTypeEnumerable.SetAccessors(
+                        IEnumerable<string> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IEnumerable<string>) : PrincipalBaseUnsafeAccessors.RefTypeEnumerable((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IEnumerable<string> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IEnumerable<string>) : PrincipalBaseUnsafeAccessors.RefTypeEnumerable((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 33),
+                        IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+                    refTypeEnumerable.SetPropertyIndexes(
+                        index: 32,
+                        originalValueIndex: 33,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v)),
+                        keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                            JsonStringReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                            JsonStringReaderWriter.Instance),
+                        elementMapping: JetStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            keyComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(255)",
+                                size: 255)));
+                    var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+                    refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+                    refTypeEnumerable.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var refTypeIList = complexType.AddProperty(
+                        "RefTypeIList",
+                        typeof(IList<string>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeIList.SetGetter(
+                        IList<string> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IList<string>) : PrincipalBaseUnsafeAccessors.RefTypeIList((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IList<string>) : PrincipalBaseUnsafeAccessors.RefTypeIList((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))) == null,
+                        IList<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance) == null);
+                    refTypeIList.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IList<string> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeIList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                            return instance;
+                        });
+                    refTypeIList.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IList<string> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeIList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                            return instance;
+                        });
+                    refTypeIList.SetAccessors(
+                        IList<string> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IList<string>) : PrincipalBaseUnsafeAccessors.RefTypeIList((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IList<string> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IList<string>) : PrincipalBaseUnsafeAccessors.RefTypeIList((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 34),
+                        IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+                    refTypeIList.SetPropertyIndexes(
+                        index: 33,
+                        originalValueIndex: 34,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v)),
+                        keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                            JsonStringReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                            JsonStringReaderWriter.Instance),
+                        elementMapping: JetStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            keyComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(255)",
+                                size: 255)));
+                    var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+                    refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+                    refTypeIList.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var refTypeList = complexType.AddProperty(
+                        "RefTypeList",
+                        typeof(List<IPAddress>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeList.SetGetter(
+                        List<IPAddress> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(List<IPAddress>) : PrincipalBaseUnsafeAccessors.RefTypeList((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(List<IPAddress>) : PrincipalBaseUnsafeAccessors.RefTypeList((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))) == null,
+                        List<IPAddress> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance) == null);
+                    refTypeList.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, List<IPAddress> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                            return instance;
+                        });
+                    refTypeList.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, List<IPAddress> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                            return instance;
+                        });
+                    refTypeList.SetAccessors(
+                        List<IPAddress> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(List<IPAddress>) : PrincipalBaseUnsafeAccessors.RefTypeList((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        List<IPAddress> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(List<IPAddress>) : PrincipalBaseUnsafeAccessors.RefTypeList((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 35),
+                        List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+                    refTypeList.SetPropertyIndexes(
+                        index: 34,
+                        originalValueIndex: 35,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v)),
+                        keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v))))),
+                        jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v)))),
+                        elementMapping: JetStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<IPAddress>(
+                                bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                int (IPAddress v) => ((object)v).GetHashCode(),
+                                IPAddress (IPAddress v) => v),
+                            keyComparer: new ValueComparer<IPAddress>(
+                                bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                int (IPAddress v) => ((object)v).GetHashCode(),
+                                IPAddress (IPAddress v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(45)",
+                                size: 45),
+                            converter: new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)),
+                            jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v)))));
+                    var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+                    refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+                    refTypeList.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var valueTypeArray = complexType.AddProperty(
+                        "ValueTypeArray",
+                        typeof(DateTime[]),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeArray.SetGetter(
+                        DateTime[] (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(DateTime[]) : PrincipalBaseUnsafeAccessors.ValueTypeArray((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(DateTime[]) : PrincipalBaseUnsafeAccessors.ValueTypeArray((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))) == null,
+                        DateTime[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) == null);
+                    valueTypeArray.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, DateTime[] value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeArray(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                            return instance;
+                        });
+                    valueTypeArray.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, DateTime[] value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeArray(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                            return instance;
+                        });
+                    valueTypeArray.SetAccessors(
+                        DateTime[] (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(DateTime[]) : PrincipalBaseUnsafeAccessors.ValueTypeArray((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        DateTime[] (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(DateTime[]) : PrincipalBaseUnsafeAccessors.ValueTypeArray((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 36),
+                        DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+                    valueTypeArray.SetPropertyIndexes(
+                        index: 35,
+                        originalValueIndex: 36,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v)),
+                        keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                            JsonDateTimeReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                            JsonDateTimeReaderWriter.Instance),
+                        elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<DateTime>(
+                                bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                                int (DateTime v) => ((object)v).GetHashCode(),
+                                DateTime (DateTime v) => v),
+                            keyComparer: new ValueComparer<DateTime>(
+                                bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                                int (DateTime v) => ((object)v).GetHashCode(),
+                                DateTime (DateTime v) => v),
+                            providerValueComparer: new ValueComparer<DateTime>(
+                                bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                                int (DateTime v) => ((object)v).GetHashCode(),
+                                DateTime (DateTime v) => v)));
+                    var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+                    valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+                    valueTypeArray.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var valueTypeEnumerable = complexType.AddProperty(
+                        "ValueTypeEnumerable",
+                        typeof(IEnumerable<byte>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeEnumerable.SetGetter(
+                        IEnumerable<byte> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IEnumerable<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeEnumerable((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IEnumerable<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeEnumerable((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))) == null,
+                        IEnumerable<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) == null);
+                    valueTypeEnumerable.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IEnumerable<byte> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                            return instance;
+                        });
+                    valueTypeEnumerable.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IEnumerable<byte> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                            return instance;
+                        });
+                    valueTypeEnumerable.SetAccessors(
+                        IEnumerable<byte> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IEnumerable<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeEnumerable((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IEnumerable<byte> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IEnumerable<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeEnumerable((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 37),
+                        IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+                    valueTypeEnumerable.SetPropertyIndexes(
+                        index: 36,
+                        originalValueIndex: 37,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)),
+                        keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                            JsonByteReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                            JsonByteReaderWriter.Instance),
+                        elementMapping: JetByteTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v),
+                            keyComparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v),
+                            providerValueComparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v)));
+                    var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+                    valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+                    valueTypeEnumerable.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var valueTypeIList = complexType.AddProperty(
+                        "ValueTypeIList",
+                        typeof(IList<byte>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeIList.SetGetter(
+                        IList<byte> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IList<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeIList((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(IList<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeIList((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))) == null,
+                        IList<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) == null);
+                    valueTypeIList.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IList<byte> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeIList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                            return instance;
+                        });
+                    valueTypeIList.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, IList<byte> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeIList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                            return instance;
+                        });
+                    valueTypeIList.SetAccessors(
+                        IList<byte> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IList<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeIList((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IList<byte> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(IList<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeIList((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 38),
+                        IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+                    valueTypeIList.SetPropertyIndexes(
+                        index: 37,
+                        originalValueIndex: 38,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)),
+                        keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                            JsonByteReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                            JsonByteReaderWriter.Instance),
+                        elementMapping: JetByteTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v),
+                            keyComparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v),
+                            providerValueComparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v)));
+                    var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+                    valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+                    valueTypeIList.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    var valueTypeList = complexType.AddProperty(
+                        "ValueTypeList",
+                        typeof(List<short>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeList.SetGetter(
+                        List<short> (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(List<short>) : PrincipalBaseUnsafeAccessors.ValueTypeList((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))),
+                        bool (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices) => ((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))) == null ? default(List<short>) : PrincipalBaseUnsafeAccessors.ValueTypeList((PrincipalBaseUnsafeAccessors._ownedField(entity) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(entity))))) == null,
+                        List<short> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance) == null);
+                    valueTypeList.SetSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, List<short> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                            return instance;
+                        });
+                    valueTypeList.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalBase entity, IReadOnlyList<int> indices, List<short> value) =>
+                        {
+                            var level1 = PrincipalBaseUnsafeAccessors._ownedField(entity);
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                            return instance;
+                        });
+                    valueTypeList.SetAccessors(
+                        List<short> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(List<short>) : PrincipalBaseUnsafeAccessors.ValueTypeList((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        List<short> (IInternalEntry entry) => ((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))) == null ? default(List<short>) : PrincipalBaseUnsafeAccessors.ValueTypeList((PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))) == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal(PrincipalBaseUnsafeAccessors._ownedField(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))))),
+                        List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 39),
+                        List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+                    valueTypeList.SetPropertyIndexes(
+                        index: 38,
+                        originalValueIndex: 39,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v)),
+                        keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                            JsonInt16ReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                            JsonInt16ReaderWriter.Instance),
+                        elementMapping: ShortTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<short>(
+                                bool (short v1, short v2) => v1 == v2,
+                                int (short v) => ((int)v),
+                                short (short v) => v),
+                            keyComparer: new ValueComparer<short>(
+                                bool (short v1, short v2) => v1 == v2,
+                                int (short v) => ((int)v),
+                                short (short v) => v),
+                            providerValueComparer: new ValueComparer<short>(
+                                bool (short v1, short v2) => v1 == v2,
+                                int (short v) => ((int)v),
+                                short (short v) => v)));
+                    var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+                    valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+                    valueTypeList.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.None);
+
+                    complexType.AddAnnotation("Relational:FunctionName", "PrincipalBaseTvf");
+                    complexType.AddAnnotation("Relational:Schema", null);
+                    complexType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+                    complexType.AddAnnotation("Relational:TableName", "PrincipalBase");
+                    complexType.AddAnnotation("Relational:ViewName", "PrincipalBaseView");
+                    complexType.AddAnnotation("Relational:ViewSchema", null);
+                    return complexProperty;
+                }
+            }
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deriveds = principalEntityType.AddNavigation("Deriveds",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Deriveds", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Deriveds>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            deriveds.SetGetter(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Deriveds(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Deriveds(instance) == null);
+            deriveds.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Deriveds(instance) = value;
+                    return instance;
+                });
+            deriveds.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Deriveds(instance) = value;
+                    return instance;
+                });
+            deriveds.SetAccessors(
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Deriveds(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Deriveds(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                null,
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => entry.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds));
+            deriveds.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 2,
+                storeGenerationIndex: -1);
+            deriveds.SetCollectionAccessor<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase entity) => PrincipalBaseUnsafeAccessors.Deriveds(entity),
+                (CompiledModelTestBase.PrincipalBase entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalBaseUnsafeAccessors.Deriveds(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                (CompiledModelTestBase.PrincipalBase entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalBaseUnsafeAccessors.Deriveds(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase entity, Action<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>> setter) => ClrCollectionAccessorFactory.CreateAndSetHashSet<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(entity, setter),
+                ICollection<CompiledModelTestBase.PrincipalBase> () => ((ICollection<CompiledModelTestBase.PrincipalBase>)(((ICollection<CompiledModelTestBase.PrincipalBase>)(new HashSet<CompiledModelTestBase.PrincipalBase>(ReferenceEqualityComparer.Instance))))));
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var discriminator = runtimeEntityType.FindProperty("Discriminator");
+            var enum1 = runtimeEntityType.FindProperty("Enum1");
+            var enum2 = runtimeEntityType.FindProperty("Enum2");
+            var flagsEnum1 = runtimeEntityType.FindProperty("FlagsEnum1");
+            var flagsEnum2 = runtimeEntityType.FindProperty("FlagsEnum2");
+            var principalBaseId = runtimeEntityType.FindProperty("PrincipalBaseId");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var owned = runtimeEntityType.FindComplexProperty("Owned");
+            var ownedType = owned.ComplexType;
+            var details = ownedType.FindProperty("Details");
+            var number = ownedType.FindProperty("Number");
+            var refTypeArray0 = ownedType.FindProperty("RefTypeArray");
+            var refTypeEnumerable0 = ownedType.FindProperty("RefTypeEnumerable");
+            var refTypeIList0 = ownedType.FindProperty("RefTypeIList");
+            var refTypeList0 = ownedType.FindProperty("RefTypeList");
+            var valueTypeArray0 = ownedType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable0 = ownedType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList0 = ownedType.FindProperty("ValueTypeIList");
+            var valueTypeList0 = ownedType.FindProperty("ValueTypeList");
+            var principal = ownedType.FindComplexProperty("Principal");
+            var principalBase = principal.ComplexType;
+            var alternateId = principalBase.FindProperty("AlternateId");
+            var enum10 = principalBase.FindProperty("Enum1");
+            var enum20 = principalBase.FindProperty("Enum2");
+            var flagsEnum10 = principalBase.FindProperty("FlagsEnum1");
+            var flagsEnum20 = principalBase.FindProperty("FlagsEnum2");
+            var id0 = principalBase.FindProperty("Id");
+            var refTypeArray1 = principalBase.FindProperty("RefTypeArray");
+            var refTypeEnumerable1 = principalBase.FindProperty("RefTypeEnumerable");
+            var refTypeIList1 = principalBase.FindProperty("RefTypeIList");
+            var refTypeList1 = principalBase.FindProperty("RefTypeList");
+            var valueTypeArray1 = principalBase.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable1 = principalBase.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList1 = principalBase.FindProperty("ValueTypeIList");
+            var valueTypeList1 = principalBase.FindProperty("ValueTypeList");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNullableFactory<long?, long>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<long?>(key));
+            var deriveds = runtimeEntityType.FindNavigation("Deriveds");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.PrincipalBase)(source.Entity));
+                    var liftedArg = ((ISnapshot)(new Snapshot<long?, string, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum, CompiledModelTestBase.AFlagsEnum, long?, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>, string, int, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>, object, Guid, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), (source.GetCurrentValue<string>(discriminator) == null ? null : ((ValueComparer<string>)(((IProperty)discriminator).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(discriminator))), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1)), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2)), (source.GetCurrentValue<long?>(principalBaseId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalBaseId))), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))), (source.GetCurrentValue<string>(details) == null ? null : ((ValueComparer<string>)(((IProperty)details).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(details))), ((ValueComparer<int>)(((IProperty)number).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(number)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray0))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray0).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray0))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable0))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable0).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable0))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList0))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList0).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList0))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList0))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList0).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList0))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray0))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray0).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray0))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable0) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable0).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable0))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList0))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList0).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList0))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList0))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList0).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList0))))))), ((object)(source.GetCurrentValue<CompiledModelTestBase.PrincipalBase>(principal))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum10).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum10)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum20) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum20).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum20))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum10).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum10)))));
+                    var structuralType0 = ((CompiledModelTestBase.PrincipalBase)(source.Entity));
+                    return ((ISnapshot)(new MultiSnapshot(new ISnapshot[] { liftedArg, ((ISnapshot)(new Snapshot<CompiledModelTestBase.AFlagsEnum, long?, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>(((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum20).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum20)), (source.GetCurrentValue<long?>(id0) == null ? null : ((ValueComparer<long?>)(((IProperty)id0).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id0))), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray1))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray1).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray1))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable1))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable1).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable1))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList1))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList1).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList1))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList1))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList1).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList1))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray1))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray1).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray1))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable1) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable1).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable1))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList1))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList1).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList1))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList1))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList1).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList1)))))))))) })));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long?, long?, string>((default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(default(long? ))), (default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(default(long? ))), (default(string) == null ? null : ((ValueComparer<string>)(((IProperty)details).GetValueComparer())).Snapshot(default(string)))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long?, long?, string>(default(long? ), default(long? ), default(string)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<string, long?>((source.ContainsKey("Discriminator") ? ((string)(source["Discriminator"])) : null), (source.ContainsKey("PrincipalBaseId") ? ((long? )(source["PrincipalBaseId"])) : null)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<string, long?>(default(string), default(long? )))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType1 = ((CompiledModelTestBase.PrincipalBase)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, long?, object>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), (source.GetCurrentValue<long?>(principalBaseId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalBaseId))), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 39,
+                navigationCount: 1,
+                complexPropertyCount: 2,
+                complexCollectionCount: 0,
+                originalValueCount: 40,
+                shadowCount: 2,
+                relationshipCount: 3,
+                storeGeneratedCount: 3));
+            var insertSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Insert",
+                null,
+                false);
+
+            var principalBaseId0 = insertSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var enum11 = insertSproc.AddParameter(
+                "Enum1", System.Data.ParameterDirection.Input, false, "Enum1", false);
+            var enum21 = insertSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum11 = insertSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum21 = insertSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList2 = insertSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList2 = insertSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray2 = insertSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable2 = insertSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList2 = insertSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList2 = insertSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray2 = insertSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable2 = insertSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var discriminator0 = insertSproc.AddParameter(
+                "Discriminator", System.Data.ParameterDirection.Input, false, "Discriminator", false);
+            var id1 = insertSproc.AddParameter(
+                "Id", System.Data.ParameterDirection.Output, false, "Id", false);
+            runtimeEntityType.AddAnnotation("Relational:InsertStoredProcedure", insertSproc);
+
+            var deleteSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Delete",
+                null,
+                false);
+
+            var rowsAffected = deleteSproc.AddParameter(
+                "RowsAffected", System.Data.ParameterDirection.Output, true, null, null);
+            var id2 = deleteSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:DeleteStoredProcedure", deleteSproc);
+
+            var updateSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Update",
+                null,
+                false);
+
+            var principalBaseId1 = updateSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var enum12 = updateSproc.AddParameter(
+                "Enum1", System.Data.ParameterDirection.Input, false, "Enum1", false);
+            var enum22 = updateSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum12 = updateSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum22 = updateSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList3 = updateSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList3 = updateSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray3 = updateSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable3 = updateSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList3 = updateSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList3 = updateSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray3 = updateSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable3 = updateSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var id3 = updateSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:UpdateStoredProcedure", updateSproc);
+
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", "PrincipalBaseTvf");
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPH");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewDefinitionSql", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", "PrincipalBaseView");
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseUnsafeAccessors.cs
new file mode 100644
index 00000000..e85cd7e3
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseUnsafeAccessors.cs
@@ -0,0 +1,60 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class PrincipalBaseUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref long? Id(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum1>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AnEnum Enum1(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum2>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AnEnum? Enum2(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<FlagsEnum1>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AFlagsEnum FlagsEnum1(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<FlagsEnum2>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AFlagsEnum FlagsEnum2(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeArray>k__BackingField")]
+        public static extern ref IPAddress[] RefTypeArray(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeEnumerable>k__BackingField")]
+        public static extern ref IEnumerable<string> RefTypeEnumerable(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeIList>k__BackingField")]
+        public static extern ref IList<string> RefTypeIList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeList>k__BackingField")]
+        public static extern ref List<IPAddress> RefTypeList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeArray>k__BackingField")]
+        public static extern ref DateTime[] ValueTypeArray(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeEnumerable>k__BackingField")]
+        public static extern ref IEnumerable<byte> ValueTypeEnumerable(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeIList>k__BackingField")]
+        public static extern ref IList<byte> ValueTypeIList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeList>k__BackingField")]
+        public static extern ref List<short> ValueTypeList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_ownedField")]
+        public static extern ref CompiledModelTestBase.OwnedType _ownedField(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Deriveds>k__BackingField")]
+        public static extern ref ICollection<CompiledModelTestBase.PrincipalBase> Deriveds(CompiledModelTestBase.PrincipalBase @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedEntityType.cs
new file mode 100644
index 00000000..62569f00
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedEntityType.cs
@@ -0,0 +1,2436 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                baseEntityType,
+                discriminatorProperty: "Discriminator",
+                discriminatorValue: "PrincipalDerived<DependentBase<byte?>>",
+                propertyCount: 0,
+                complexPropertyCount: 1);
+
+            ManyOwnedComplexProperty.Create(runtimeEntityType);
+            return runtimeEntityType;
+        }
+
+        public static class ManyOwnedComplexProperty
+        {
+            public static RuntimeComplexProperty Create(RuntimeEntityType declaringType)
+            {
+                var complexProperty = declaringType.AddComplexProperty("ManyOwned",
+                    typeof(IList<CompiledModelTestBase.OwnedType>),
+                    "OwnedCollection",
+                    typeof(CompiledModelTestBase.OwnedType),
+                    fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("ManyOwned", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    propertyAccessMode: PropertyAccessMode.Field,
+                    collection: true,
+                    changeTrackingStrategy: ChangeTrackingStrategy.ChangingAndChangedNotificationsWithOriginalValues,
+                    propertyCount: 10,
+                    complexPropertyCount: 1);
+
+                var complexType = complexProperty.ComplexType;
+                complexProperty.SetGetter(
+                    IList<CompiledModelTestBase.OwnedType> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance) == null);
+                complexProperty.SetSetter(
+                    CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, IList<CompiledModelTestBase.OwnedType> value) =>
+                    {
+                        PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance) = value;
+                        return instance;
+                    });
+                complexProperty.SetMaterializationSetter(
+                    CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, IList<CompiledModelTestBase.OwnedType> value) =>
+                    {
+                        PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(instance) = value;
+                        return instance;
+                    });
+                complexProperty.SetIndexedCollectionAccessor(
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> structuralObject, int index) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(structuralObject)[index],
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> structuralObject, int index, CompiledModelTestBase.OwnedType value) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(structuralObject)[index] = value,
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> structuralObject, int index, CompiledModelTestBase.OwnedType value) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(structuralObject)[index] = value,
+                    IList<CompiledModelTestBase.OwnedType> (int capacity) => new List<CompiledModelTestBase.OwnedType>(capacity));
+                complexProperty.SetAccessors(
+                    IList<CompiledModelTestBase.OwnedType> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                    IList<CompiledModelTestBase.OwnedType> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                    null,
+                    IList<CompiledModelTestBase.OwnedType> (IInternalEntry entry) => entry.GetCurrentValue<IList<CompiledModelTestBase.OwnedType>>(complexProperty));
+                complexProperty.SetPropertyIndexes(
+                    index: 0,
+                    originalValueIndex: 40,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                var details = complexType.AddProperty(
+                    "Details",
+                    typeof(string),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    propertyAccessMode: PropertyAccessMode.FieldDuringConstruction,
+                    nullable: true,
+                    unicode: false,
+                    sentinel: "");
+                details.SetGetter(
+                    string (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(string) : (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]].Details),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => !(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(string) : (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]].Details) == null) && ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(string) : (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]].Details) == "",
+                    string (CompiledModelTestBase.OwnedType instance) => instance.Details,
+                    bool (CompiledModelTestBase.OwnedType instance) => !(instance.Details == null) && instance.Details == "");
+                details.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, string value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "Details", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        level1.Details = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                    {
+                        instance.Details = value;
+                        return instance;
+                    });
+                details.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, string value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "Details", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        level1.Details = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, string value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._details(instance) = value;
+                        return instance;
+                    });
+                details.SetAccessors(
+                    string (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(string) : (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]].Details),
+                    string (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(string) : (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]].Details),
+                    string (IInternalEntry entry) => entry.ReadOriginalValue<string>(details, 0),
+                    string (IInternalEntry entry) => entry.GetCurrentValue<string>(details));
+                details.SetPropertyIndexes(
+                    index: 0,
+                    originalValueIndex: 0,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                details.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255,
+                        unicode: false));
+                details.AddAnnotation("foo", "bar");
+
+                var number = complexType.AddProperty(
+                    "Number",
+                    typeof(int),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    sentinel: 0);
+                number.SetGetter(
+                    int (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(int) : OwnedTypeUnsafeAccessors.Number((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(int) : OwnedTypeUnsafeAccessors.Number((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == 0,
+                    int (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Number(instance) == 0);
+                number.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, int value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "Number", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors.Number(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                    {
+                        OwnedTypeUnsafeAccessors.Number(instance) = value;
+                        return instance;
+                    });
+                number.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, int value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "Number", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors.Number(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, int value) =>
+                    {
+                        OwnedTypeUnsafeAccessors.Number(instance) = value;
+                        return instance;
+                    });
+                number.SetAccessors(
+                    int (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(int) : OwnedTypeUnsafeAccessors.Number((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    int (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(int) : OwnedTypeUnsafeAccessors.Number((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    int (IInternalEntry entry) => entry.ReadOriginalValue<int>(number, 1),
+                    int (IInternalEntry entry) => entry.GetCurrentValue<int>(number));
+                number.SetPropertyIndexes(
+                    index: 1,
+                    originalValueIndex: 1,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                number.TypeMapping = JetIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        bool (int v1, int v2) => v1 == v2,
+                        int (int v) => v,
+                        int (int v) => v));
+
+                var refTypeArray = complexType.AddProperty(
+                    "RefTypeArray",
+                    typeof(IPAddress[]),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeArray.SetGetter(
+                    IPAddress[] (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IPAddress[]) : OwnedTypeUnsafeAccessors._refTypeArray((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IPAddress[]) : OwnedTypeUnsafeAccessors._refTypeArray((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null,
+                    IPAddress[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeArray(instance) == null);
+                refTypeArray.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IPAddress[] value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "RefTypeArray", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._refTypeArray(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                        return instance;
+                    });
+                refTypeArray.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IPAddress[] value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "RefTypeArray", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._refTypeArray(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IPAddress[] value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeArray(instance) = value;
+                        return instance;
+                    });
+                refTypeArray.SetAccessors(
+                    IPAddress[] (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IPAddress[]) : OwnedTypeUnsafeAccessors._refTypeArray((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IPAddress[] (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IPAddress[]) : OwnedTypeUnsafeAccessors._refTypeArray((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 2),
+                    IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+                refTypeArray.SetPropertyIndexes(
+                    index: 2,
+                    originalValueIndex: 2,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v)),
+                    keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v))))),
+                    jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)))),
+                    elementMapping: JetStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v),
+                        keyComparer: new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(45)",
+                            size: 45),
+                        converter: new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)))));
+                var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+                refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+                var refTypeEnumerable = complexType.AddProperty(
+                    "RefTypeEnumerable",
+                    typeof(IEnumerable<string>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeEnumerable.SetGetter(
+                    IEnumerable<string> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IEnumerable<string>) : OwnedTypeUnsafeAccessors._refTypeEnumerable((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IEnumerable<string>) : OwnedTypeUnsafeAccessors._refTypeEnumerable((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null,
+                    IEnumerable<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) == null);
+                refTypeEnumerable.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IEnumerable<string> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "RefTypeEnumerable", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._refTypeEnumerable(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                        return instance;
+                    });
+                refTypeEnumerable.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IEnumerable<string> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "RefTypeEnumerable", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._refTypeEnumerable(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<string> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeEnumerable(instance) = value;
+                        return instance;
+                    });
+                refTypeEnumerable.SetAccessors(
+                    IEnumerable<string> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IEnumerable<string>) : OwnedTypeUnsafeAccessors._refTypeEnumerable((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IEnumerable<string> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IEnumerable<string>) : OwnedTypeUnsafeAccessors._refTypeEnumerable((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 3),
+                    IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+                refTypeEnumerable.SetPropertyIndexes(
+                    index: 3,
+                    originalValueIndex: 3,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v)),
+                    keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                        JsonStringReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                        JsonStringReaderWriter.Instance),
+                    elementMapping: JetStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        keyComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255)));
+                var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+                refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+                var refTypeIList = complexType.AddProperty(
+                    "RefTypeIList",
+                    typeof(IList<string>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeIList.SetGetter(
+                    IList<string> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IList<string>) : OwnedTypeUnsafeAccessors._refTypeIList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IList<string>) : OwnedTypeUnsafeAccessors._refTypeIList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null,
+                    IList<string> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeIList(instance) == null);
+                refTypeIList.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IList<string> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "RefTypeIList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._refTypeIList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                        return instance;
+                    });
+                refTypeIList.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IList<string> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "RefTypeIList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._refTypeIList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<string> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeIList(instance) = value;
+                        return instance;
+                    });
+                refTypeIList.SetAccessors(
+                    IList<string> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IList<string>) : OwnedTypeUnsafeAccessors._refTypeIList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IList<string> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IList<string>) : OwnedTypeUnsafeAccessors._refTypeIList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 4),
+                    IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+                refTypeIList.SetPropertyIndexes(
+                    index: 4,
+                    originalValueIndex: 4,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v)),
+                    keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                        JsonStringReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                        JsonStringReaderWriter.Instance),
+                    elementMapping: JetStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        keyComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255)));
+                var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+                refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+                var refTypeList = complexType.AddProperty(
+                    "RefTypeList",
+                    typeof(List<IPAddress>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeList.SetGetter(
+                    List<IPAddress> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(List<IPAddress>) : OwnedTypeUnsafeAccessors._refTypeList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(List<IPAddress>) : OwnedTypeUnsafeAccessors._refTypeList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null,
+                    List<IPAddress> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._refTypeList(instance) == null);
+                refTypeList.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, List<IPAddress> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "RefTypeList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._refTypeList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                        return instance;
+                    });
+                refTypeList.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, List<IPAddress> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "RefTypeList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._refTypeList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<IPAddress> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._refTypeList(instance) = value;
+                        return instance;
+                    });
+                refTypeList.SetAccessors(
+                    List<IPAddress> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(List<IPAddress>) : OwnedTypeUnsafeAccessors._refTypeList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    List<IPAddress> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(List<IPAddress>) : OwnedTypeUnsafeAccessors._refTypeList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 5),
+                    List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+                refTypeList.SetPropertyIndexes(
+                    index: 5,
+                    originalValueIndex: 5,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v)),
+                    keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v))))),
+                    jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)))),
+                    elementMapping: JetStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v),
+                        keyComparer: new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(45)",
+                            size: 45),
+                        converter: new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)))));
+                var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+                refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+                var valueTypeArray = complexType.AddProperty(
+                    "ValueTypeArray",
+                    typeof(DateTime[]),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeArray.SetGetter(
+                    DateTime[] (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(DateTime[]) : OwnedTypeUnsafeAccessors._valueTypeArray((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(DateTime[]) : OwnedTypeUnsafeAccessors._valueTypeArray((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null,
+                    DateTime[] (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeArray(instance) == null);
+                valueTypeArray.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, DateTime[] value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "ValueTypeArray", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._valueTypeArray(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                        return instance;
+                    });
+                valueTypeArray.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, DateTime[] value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "ValueTypeArray", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._valueTypeArray(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, DateTime[] value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeArray(instance) = value;
+                        return instance;
+                    });
+                valueTypeArray.SetAccessors(
+                    DateTime[] (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(DateTime[]) : OwnedTypeUnsafeAccessors._valueTypeArray((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    DateTime[] (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(DateTime[]) : OwnedTypeUnsafeAccessors._valueTypeArray((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 6),
+                    DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+                valueTypeArray.SetPropertyIndexes(
+                    index: 6,
+                    originalValueIndex: 6,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)),
+                    keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                        JsonDateTimeReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                        JsonDateTimeReaderWriter.Instance),
+                    elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v),
+                        keyComparer: new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v),
+                        providerValueComparer: new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v)));
+                var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+                valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+                var valueTypeEnumerable = complexType.AddProperty(
+                    "ValueTypeEnumerable",
+                    typeof(IEnumerable<byte>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeEnumerable.SetGetter(
+                    IEnumerable<byte> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IEnumerable<byte>) : OwnedTypeUnsafeAccessors._valueTypeEnumerable((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IEnumerable<byte>) : OwnedTypeUnsafeAccessors._valueTypeEnumerable((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null,
+                    IEnumerable<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) == null);
+                valueTypeEnumerable.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IEnumerable<byte> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "ValueTypeEnumerable", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._valueTypeEnumerable(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                        return instance;
+                    });
+                valueTypeEnumerable.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IEnumerable<byte> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "ValueTypeEnumerable", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._valueTypeEnumerable(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IEnumerable<byte> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeEnumerable(instance) = value;
+                        return instance;
+                    });
+                valueTypeEnumerable.SetAccessors(
+                    IEnumerable<byte> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IEnumerable<byte>) : OwnedTypeUnsafeAccessors._valueTypeEnumerable((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IEnumerable<byte> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IEnumerable<byte>) : OwnedTypeUnsafeAccessors._valueTypeEnumerable((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 7),
+                    IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+                valueTypeEnumerable.SetPropertyIndexes(
+                    index: 7,
+                    originalValueIndex: 7,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)),
+                    keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                        JsonByteReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                        JsonByteReaderWriter.Instance),
+                    elementMapping: JetByteTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v),
+                        keyComparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v),
+                        providerValueComparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)));
+                var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+                valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+                var valueTypeIList = complexType.AddProperty(
+                    "ValueTypeIList",
+                    typeof(IList<byte>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeIList.SetGetter(
+                    IList<byte> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IList<byte>) : OwnedTypeUnsafeAccessors.ValueTypeIList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(IList<byte>) : OwnedTypeUnsafeAccessors.ValueTypeIList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null,
+                    IList<byte> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.ValueTypeIList(instance) == null);
+                valueTypeIList.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IList<byte> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "ValueTypeIList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors.ValueTypeIList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                        return instance;
+                    });
+                valueTypeIList.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IList<byte> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "ValueTypeIList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors.ValueTypeIList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, IList<byte> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors.ValueTypeIList(instance) = value;
+                        return instance;
+                    });
+                valueTypeIList.SetAccessors(
+                    IList<byte> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IList<byte>) : OwnedTypeUnsafeAccessors.ValueTypeIList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IList<byte> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(IList<byte>) : OwnedTypeUnsafeAccessors.ValueTypeIList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 8),
+                    IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+                valueTypeIList.SetPropertyIndexes(
+                    index: 8,
+                    originalValueIndex: 8,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)),
+                    keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                        JsonByteReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                        JsonByteReaderWriter.Instance),
+                    elementMapping: JetByteTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v),
+                        keyComparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v),
+                        providerValueComparer: new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)));
+                var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+                valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+                var valueTypeList = complexType.AddProperty(
+                    "ValueTypeList",
+                    typeof(List<short>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeList.SetGetter(
+                    List<short> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(List<short>) : OwnedTypeUnsafeAccessors._valueTypeList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                    bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(List<short>) : OwnedTypeUnsafeAccessors._valueTypeList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null,
+                    List<short> (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance),
+                    bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors._valueTypeList(instance) == null);
+                valueTypeList.SetSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, List<short> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "ValueTypeList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._valueTypeList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                        return instance;
+                    });
+                valueTypeList.SetMaterializationSetter(
+                    (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, List<short> value) =>
+                    {
+                        var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                        if (level1 == null)
+                        {
+                            throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "ValueTypeList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                        }
+
+                        OwnedTypeUnsafeAccessors._valueTypeList(level1) = value;
+                    },
+                    CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, List<short> value) =>
+                    {
+                        OwnedTypeUnsafeAccessors._valueTypeList(instance) = value;
+                        return instance;
+                    });
+                valueTypeList.SetAccessors(
+                    List<short> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(List<short>) : OwnedTypeUnsafeAccessors._valueTypeList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    List<short> (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(List<short>) : OwnedTypeUnsafeAccessors._valueTypeList((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                    List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 9),
+                    List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+                valueTypeList.SetPropertyIndexes(
+                    index: 9,
+                    originalValueIndex: 9,
+                    shadowIndex: -1,
+                    relationshipIndex: -1,
+                    storeGenerationIndex: -1);
+                valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                    comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)),
+                    keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255),
+                    converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                        JsonInt16ReaderWriter.Instance)),
+                    jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                        JsonInt16ReaderWriter.Instance),
+                    elementMapping: ShortTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v),
+                        keyComparer: new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v),
+                        providerValueComparer: new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v)));
+                var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+                valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+                PrincipalComplexProperty.Create(complexType);
+                complexType.AddAnnotation("go", "brr");
+                complexType.AddAnnotation("Relational:ContainerColumnName", "ManyOwned");
+                complexType.AddAnnotation("Relational:FunctionName", null);
+                complexType.AddAnnotation("Relational:Schema", null);
+                complexType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+                complexType.AddAnnotation("Relational:TableName", "PrincipalBase");
+                complexType.AddAnnotation("Relational:ViewName", null);
+                complexType.AddAnnotation("Relational:ViewSchema", null);
+                complexProperty.AddAnnotation("goo", "ber");
+                return complexProperty;
+            }
+
+            public static class PrincipalComplexProperty
+            {
+                public static RuntimeComplexProperty Create(RuntimeComplexType declaringType)
+                {
+                    var complexProperty = declaringType.AddComplexProperty("Principal",
+                        typeof(CompiledModelTestBase.PrincipalBase),
+                        "OwnedCollection.Principal#PrincipalBase",
+                        typeof(CompiledModelTestBase.PrincipalBase),
+                        propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Principal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Principal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true,
+                        propertyCount: 14);
+
+                    var complexType = complexProperty.ComplexType;
+                    complexProperty.SetGetter(
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null,
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Principal(instance),
+                        bool (CompiledModelTestBase.OwnedType instance) => OwnedTypeUnsafeAccessors.Principal(instance) == null);
+                    complexProperty.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.PrincipalBase value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "Principal", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            OwnedTypeUnsafeAccessors.Principal(level1) = value;
+                        },
+                        CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, CompiledModelTestBase.PrincipalBase value) =>
+                        {
+                            OwnedTypeUnsafeAccessors.Principal(instance) = value;
+                            return instance;
+                        });
+                    complexProperty.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.PrincipalBase value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection (OwnedType)", "Principal", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            OwnedTypeUnsafeAccessors.Principal(level1) = value;
+                        },
+                        CompiledModelTestBase.OwnedType (CompiledModelTestBase.OwnedType instance, CompiledModelTestBase.PrincipalBase value) =>
+                        {
+                            OwnedTypeUnsafeAccessors.Principal(instance) = value;
+                            return instance;
+                        });
+                    complexProperty.SetAccessors(
+                        CompiledModelTestBase.PrincipalBase (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                        CompiledModelTestBase.PrincipalBase (IInternalEntry entry) => ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])),
+                        null,
+                        CompiledModelTestBase.PrincipalBase (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.PrincipalBase>(complexProperty));
+                    complexProperty.SetPropertyIndexes(
+                        index: 0,
+                        originalValueIndex: 10,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    var alternateId = complexType.AddProperty(
+                        "AlternateId",
+                        typeof(Guid),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("AlternateId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+                    alternateId.SetGetter(
+                        Guid (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(Guid) : ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])).AlternateId),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(Guid) : ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])).AlternateId) == new Guid("00000000-0000-0000-0000-000000000000"),
+                        Guid (CompiledModelTestBase.PrincipalBase instance) => instance.AlternateId,
+                        bool (CompiledModelTestBase.PrincipalBase instance) => instance.AlternateId == new Guid("00000000-0000-0000-0000-000000000000"));
+                    alternateId.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, Guid value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "AlternateId", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            level2.AlternateId = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, Guid value) =>
+                        {
+                            instance.AlternateId = value;
+                            return instance;
+                        });
+                    alternateId.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, Guid value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "AlternateId", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            level2.AlternateId = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, Guid value) =>
+                        {
+                            instance.AlternateId = value;
+                            return instance;
+                        });
+                    alternateId.SetAccessors(
+                        Guid (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(Guid) : ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])).AlternateId),
+                        Guid (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(Guid) : ((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])).AlternateId),
+                        Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(alternateId, 11),
+                        Guid (IInternalEntry entry) => entry.GetCurrentValue<Guid>(alternateId));
+                    alternateId.SetPropertyIndexes(
+                        index: 10,
+                        originalValueIndex: 11,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    alternateId.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<Guid>(
+                            bool (Guid v1, Guid v2) => v1 == v2,
+                            int (Guid v) => ((object)v).GetHashCode(),
+                            Guid (Guid v) => v),
+                        keyComparer: new ValueComparer<Guid>(
+                            bool (Guid v1, Guid v2) => v1 == v2,
+                            int (Guid v) => ((object)v).GetHashCode(),
+                            Guid (Guid v) => v),
+                        providerValueComparer: new ValueComparer<Guid>(
+                            bool (Guid v1, Guid v2) => v1 == v2,
+                            int (Guid v) => ((object)v).GetHashCode(),
+                            Guid (Guid v) => v));
+
+                    var enum1 = complexType.AddProperty(
+                        "Enum1",
+                        typeof(CompiledModelTestBase.AnEnum),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+                    enum1.SetGetter(
+                        CompiledModelTestBase.AnEnum (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(CompiledModelTestBase.AnEnum) : PrincipalBaseUnsafeAccessors.Enum1(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => object.Equals(((object)((((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(CompiledModelTestBase.AnEnum) : PrincipalBaseUnsafeAccessors.Enum1(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))))), ((object)((CompiledModelTestBase.AnEnum)0L))),
+                        CompiledModelTestBase.AnEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum1(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.Enum1(instance))), ((object)((CompiledModelTestBase.AnEnum)0L))));
+                    enum1.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.AnEnum value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "Enum1", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Enum1(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                            return instance;
+                        });
+                    enum1.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.AnEnum value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "Enum1", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Enum1(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                            return instance;
+                        });
+                    enum1.SetAccessors(
+                        CompiledModelTestBase.AnEnum (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(CompiledModelTestBase.AnEnum) : PrincipalBaseUnsafeAccessors.Enum1(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        CompiledModelTestBase.AnEnum (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(CompiledModelTestBase.AnEnum) : PrincipalBaseUnsafeAccessors.Enum1(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum>(enum1, 12),
+                        CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1));
+                    enum1.SetPropertyIndexes(
+                        index: 11,
+                        originalValueIndex: 12,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    enum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            bool (int v1, int v2) => v1 == v2,
+                            int (int v) => v,
+                            int (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                            int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                            CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                                int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                                CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+                    enum1.SetSentinelFromProviderValue(0);
+
+                    var enum2 = complexType.AddProperty(
+                        "Enum2",
+                        typeof(CompiledModelTestBase.AnEnum?),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    enum2.SetGetter(
+                        CompiledModelTestBase.AnEnum? (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(CompiledModelTestBase.AnEnum? ) : PrincipalBaseUnsafeAccessors.Enum2(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => !((((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(CompiledModelTestBase.AnEnum? ) : PrincipalBaseUnsafeAccessors.Enum2(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))).HasValue),
+                        CompiledModelTestBase.AnEnum? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum2(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Enum2(instance).HasValue));
+                    enum2.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.AnEnum? value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "Enum2", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Enum2(level2) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                            return instance;
+                        });
+                    enum2.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.AnEnum? value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "Enum2", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Enum2(level2) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                            return instance;
+                        });
+                    enum2.SetAccessors(
+                        CompiledModelTestBase.AnEnum? (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(CompiledModelTestBase.AnEnum? ) : PrincipalBaseUnsafeAccessors.Enum2(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        CompiledModelTestBase.AnEnum? (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(CompiledModelTestBase.AnEnum? ) : PrincipalBaseUnsafeAccessors.Enum2(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum?>(enum2, 13),
+                        CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2));
+                    enum2.SetPropertyIndexes(
+                        index: 12,
+                        originalValueIndex: 13,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    enum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            bool (int v1, int v2) => v1 == v2,
+                            int (int v) => v,
+                            int (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                            int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                            CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                                int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                                CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+                    enum2.SetComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.Comparer));
+                    enum2.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.KeyComparer));
+
+                    var flagsEnum1 = complexType.AddProperty(
+                        "FlagsEnum1",
+                        typeof(CompiledModelTestBase.AFlagsEnum),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+                    flagsEnum1.SetGetter(
+                        CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum1(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => object.Equals(((object)((((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum1(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))),
+                        CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum1(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum1(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+                    flagsEnum1.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "FlagsEnum1", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.FlagsEnum1(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                            return instance;
+                        });
+                    flagsEnum1.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "FlagsEnum1", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.FlagsEnum1(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                            return instance;
+                        });
+                    flagsEnum1.SetAccessors(
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum1(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum1(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1, 14),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1));
+                    flagsEnum1.SetPropertyIndexes(
+                        index: 13,
+                        originalValueIndex: 14,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    flagsEnum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            bool (int v1, int v2) => v1 == v2,
+                            int (int v) => v,
+                            int (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                            int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                            CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                                int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                                CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+                    flagsEnum1.SetSentinelFromProviderValue(0);
+
+                    var flagsEnum2 = complexType.AddProperty(
+                        "FlagsEnum2",
+                        typeof(CompiledModelTestBase.AFlagsEnum),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+                    flagsEnum2.SetGetter(
+                        CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum2(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => object.Equals(((object)((((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum2(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))),
+                        CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum2(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum2(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+                    flagsEnum2.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "FlagsEnum2", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.FlagsEnum2(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.FlagsEnum2(instance) = value;
+                            return instance;
+                        });
+                    flagsEnum2.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "FlagsEnum2", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.FlagsEnum2(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.FlagsEnum2(instance) = value;
+                            return instance;
+                        });
+                    flagsEnum2.SetAccessors(
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum2(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(CompiledModelTestBase.AFlagsEnum) : PrincipalBaseUnsafeAccessors.FlagsEnum2(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2, 15),
+                        CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2));
+                    flagsEnum2.SetPropertyIndexes(
+                        index: 14,
+                        originalValueIndex: 15,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    flagsEnum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                            int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                            CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            bool (int v1, int v2) => v1 == v2,
+                            int (int v) => v,
+                            int (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                            int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                            CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                                int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                                CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+                    flagsEnum2.SetSentinelFromProviderValue(0);
+
+                    var id = complexType.AddProperty(
+                        "Id",
+                        typeof(long?),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    id.SetGetter(
+                        long? (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(long? ) : PrincipalBaseUnsafeAccessors.Id(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => !((((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(long? ) : PrincipalBaseUnsafeAccessors.Id(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))).HasValue),
+                        long? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Id(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Id(instance).HasValue));
+                    id.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, long? value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "Id", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Id(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                            return instance;
+                        });
+                    id.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, long? value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "Id", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.Id(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                            return instance;
+                        });
+                    id.SetAccessors(
+                        long? (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(long? ) : PrincipalBaseUnsafeAccessors.Id(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        long? (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(long? ) : PrincipalBaseUnsafeAccessors.Id(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(id, 16),
+                        long? (IInternalEntry entry) => entry.GetCurrentValue<long?>(id));
+                    id.SetPropertyIndexes(
+                        index: 15,
+                        originalValueIndex: 16,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    id.TypeMapping = JetLongTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<long>(
+                            bool (long v1, long v2) => v1 == v2,
+                            int (long v) => ((object)v).GetHashCode(),
+                            long (long v) => v),
+                        keyComparer: new ValueComparer<long>(
+                            bool (long v1, long v2) => v1 == v2,
+                            int (long v) => ((object)v).GetHashCode(),
+                            long (long v) => v),
+                        providerValueComparer: new ValueComparer<long>(
+                            bool (long v1, long v2) => v1 == v2,
+                            int (long v) => ((object)v).GetHashCode(),
+                            long (long v) => v));
+                    id.SetComparer(new NullableValueComparer<long>(id.TypeMapping.Comparer));
+                    id.SetKeyComparer(new NullableValueComparer<long>(id.TypeMapping.KeyComparer));
+
+                    var refTypeArray = complexType.AddProperty(
+                        "RefTypeArray",
+                        typeof(IPAddress[]),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeArray.SetGetter(
+                        IPAddress[] (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IPAddress[]) : PrincipalBaseUnsafeAccessors.RefTypeArray(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IPAddress[]) : PrincipalBaseUnsafeAccessors.RefTypeArray(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))) == null,
+                        IPAddress[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance) == null);
+                    refTypeArray.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IPAddress[] value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "RefTypeArray", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeArray(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                            return instance;
+                        });
+                    refTypeArray.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IPAddress[] value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "RefTypeArray", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeArray(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                            return instance;
+                        });
+                    refTypeArray.SetAccessors(
+                        IPAddress[] (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IPAddress[]) : PrincipalBaseUnsafeAccessors.RefTypeArray(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IPAddress[] (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IPAddress[]) : PrincipalBaseUnsafeAccessors.RefTypeArray(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 17),
+                        IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+                    refTypeArray.SetPropertyIndexes(
+                        index: 16,
+                        originalValueIndex: 17,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v)),
+                        keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v))))),
+                        jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v)))),
+                        elementMapping: JetStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<IPAddress>(
+                                bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                int (IPAddress v) => ((object)v).GetHashCode(),
+                                IPAddress (IPAddress v) => v),
+                            keyComparer: new ValueComparer<IPAddress>(
+                                bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                int (IPAddress v) => ((object)v).GetHashCode(),
+                                IPAddress (IPAddress v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(45)",
+                                size: 45),
+                            converter: new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)),
+                            jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v)))));
+                    var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+                    refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+                    var refTypeEnumerable = complexType.AddProperty(
+                        "RefTypeEnumerable",
+                        typeof(IEnumerable<string>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeEnumerable.SetGetter(
+                        IEnumerable<string> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IEnumerable<string>) : PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IEnumerable<string>) : PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))) == null,
+                        IEnumerable<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) == null);
+                    refTypeEnumerable.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IEnumerable<string> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "RefTypeEnumerable", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeEnumerable(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                            return instance;
+                        });
+                    refTypeEnumerable.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IEnumerable<string> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "RefTypeEnumerable", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeEnumerable(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                            return instance;
+                        });
+                    refTypeEnumerable.SetAccessors(
+                        IEnumerable<string> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IEnumerable<string>) : PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IEnumerable<string> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IEnumerable<string>) : PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 18),
+                        IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+                    refTypeEnumerable.SetPropertyIndexes(
+                        index: 17,
+                        originalValueIndex: 18,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v)),
+                        keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                            JsonStringReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                            JsonStringReaderWriter.Instance),
+                        elementMapping: JetStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            keyComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(255)",
+                                size: 255)));
+                    var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+                    refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+                    var refTypeIList = complexType.AddProperty(
+                        "RefTypeIList",
+                        typeof(IList<string>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeIList.SetGetter(
+                        IList<string> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IList<string>) : PrincipalBaseUnsafeAccessors.RefTypeIList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IList<string>) : PrincipalBaseUnsafeAccessors.RefTypeIList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))) == null,
+                        IList<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance) == null);
+                    refTypeIList.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IList<string> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "RefTypeIList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeIList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                            return instance;
+                        });
+                    refTypeIList.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IList<string> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "RefTypeIList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeIList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                            return instance;
+                        });
+                    refTypeIList.SetAccessors(
+                        IList<string> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IList<string>) : PrincipalBaseUnsafeAccessors.RefTypeIList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IList<string> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IList<string>) : PrincipalBaseUnsafeAccessors.RefTypeIList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 19),
+                        IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+                    refTypeIList.SetPropertyIndexes(
+                        index: 18,
+                        originalValueIndex: 19,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v)),
+                        keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                            JsonStringReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                            JsonStringReaderWriter.Instance),
+                        elementMapping: JetStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            keyComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(255)",
+                                size: 255)));
+                    var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+                    refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+                    var refTypeList = complexType.AddProperty(
+                        "RefTypeList",
+                        typeof(List<IPAddress>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeList.SetGetter(
+                        List<IPAddress> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(List<IPAddress>) : PrincipalBaseUnsafeAccessors.RefTypeList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(List<IPAddress>) : PrincipalBaseUnsafeAccessors.RefTypeList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))) == null,
+                        List<IPAddress> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance) == null);
+                    refTypeList.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, List<IPAddress> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "RefTypeList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                            return instance;
+                        });
+                    refTypeList.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, List<IPAddress> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "RefTypeList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.RefTypeList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                            return instance;
+                        });
+                    refTypeList.SetAccessors(
+                        List<IPAddress> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(List<IPAddress>) : PrincipalBaseUnsafeAccessors.RefTypeList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        List<IPAddress> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(List<IPAddress>) : PrincipalBaseUnsafeAccessors.RefTypeList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 20),
+                        List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+                    refTypeList.SetPropertyIndexes(
+                        index: 19,
+                        originalValueIndex: 20,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v)),
+                        keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                            bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            int (IPAddress v) => ((object)v).GetHashCode(),
+                            IPAddress (IPAddress v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v))))),
+                        jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v)))),
+                        elementMapping: JetStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<IPAddress>(
+                                bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                int (IPAddress v) => ((object)v).GetHashCode(),
+                                IPAddress (IPAddress v) => v),
+                            keyComparer: new ValueComparer<IPAddress>(
+                                bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                int (IPAddress v) => ((object)v).GetHashCode(),
+                                IPAddress (IPAddress v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                bool (string v1, string v2) => v1 == v2,
+                                int (string v) => ((object)v).GetHashCode(),
+                                string (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(45)",
+                                size: 45),
+                            converter: new ValueConverter<IPAddress, string>(
+                                string (IPAddress v) => ((object)v).ToString(),
+                                IPAddress (string v) => IPAddress.Parse(v)),
+                            jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    string (IPAddress v) => ((object)v).ToString(),
+                                    IPAddress (string v) => IPAddress.Parse(v)))));
+                    var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+                    refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+                    var valueTypeArray = complexType.AddProperty(
+                        "ValueTypeArray",
+                        typeof(DateTime[]),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeArray.SetGetter(
+                        DateTime[] (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(DateTime[]) : PrincipalBaseUnsafeAccessors.ValueTypeArray(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(DateTime[]) : PrincipalBaseUnsafeAccessors.ValueTypeArray(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))) == null,
+                        DateTime[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) == null);
+                    valueTypeArray.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, DateTime[] value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "ValueTypeArray", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeArray(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                            return instance;
+                        });
+                    valueTypeArray.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, DateTime[] value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "ValueTypeArray", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeArray(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                            return instance;
+                        });
+                    valueTypeArray.SetAccessors(
+                        DateTime[] (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(DateTime[]) : PrincipalBaseUnsafeAccessors.ValueTypeArray(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        DateTime[] (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(DateTime[]) : PrincipalBaseUnsafeAccessors.ValueTypeArray(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 21),
+                        DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+                    valueTypeArray.SetPropertyIndexes(
+                        index: 20,
+                        originalValueIndex: 21,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v)),
+                        keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                            bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            int (DateTime v) => ((object)v).GetHashCode(),
+                            DateTime (DateTime v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                            JsonDateTimeReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                            JsonDateTimeReaderWriter.Instance),
+                        elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<DateTime>(
+                                bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                                int (DateTime v) => ((object)v).GetHashCode(),
+                                DateTime (DateTime v) => v),
+                            keyComparer: new ValueComparer<DateTime>(
+                                bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                                int (DateTime v) => ((object)v).GetHashCode(),
+                                DateTime (DateTime v) => v),
+                            providerValueComparer: new ValueComparer<DateTime>(
+                                bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                                int (DateTime v) => ((object)v).GetHashCode(),
+                                DateTime (DateTime v) => v)));
+                    var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+                    valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+                    var valueTypeEnumerable = complexType.AddProperty(
+                        "ValueTypeEnumerable",
+                        typeof(IEnumerable<byte>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeEnumerable.SetGetter(
+                        IEnumerable<byte> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IEnumerable<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IEnumerable<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))) == null,
+                        IEnumerable<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) == null);
+                    valueTypeEnumerable.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IEnumerable<byte> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "ValueTypeEnumerable", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                            return instance;
+                        });
+                    valueTypeEnumerable.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IEnumerable<byte> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "ValueTypeEnumerable", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                            return instance;
+                        });
+                    valueTypeEnumerable.SetAccessors(
+                        IEnumerable<byte> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IEnumerable<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IEnumerable<byte> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IEnumerable<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 22),
+                        IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+                    valueTypeEnumerable.SetPropertyIndexes(
+                        index: 21,
+                        originalValueIndex: 22,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)),
+                        keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                            JsonByteReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                            JsonByteReaderWriter.Instance),
+                        elementMapping: JetByteTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v),
+                            keyComparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v),
+                            providerValueComparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v)));
+                    var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+                    valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+                    var valueTypeIList = complexType.AddProperty(
+                        "ValueTypeIList",
+                        typeof(IList<byte>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeIList.SetGetter(
+                        IList<byte> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IList<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeIList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(IList<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeIList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))) == null,
+                        IList<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) == null);
+                    valueTypeIList.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IList<byte> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "ValueTypeIList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeIList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                            return instance;
+                        });
+                    valueTypeIList.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, IList<byte> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "ValueTypeIList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeIList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                            return instance;
+                        });
+                    valueTypeIList.SetAccessors(
+                        IList<byte> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IList<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeIList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IList<byte> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(IList<byte>) : PrincipalBaseUnsafeAccessors.ValueTypeIList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 23),
+                        IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+                    valueTypeIList.SetPropertyIndexes(
+                        index: 22,
+                        originalValueIndex: 23,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)),
+                        keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                            bool (byte v1, byte v2) => v1 == v2,
+                            int (byte v) => ((int)v),
+                            byte (byte v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                            JsonByteReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                            JsonByteReaderWriter.Instance),
+                        elementMapping: JetByteTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v),
+                            keyComparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v),
+                            providerValueComparer: new ValueComparer<byte>(
+                                bool (byte v1, byte v2) => v1 == v2,
+                                int (byte v) => ((int)v),
+                                byte (byte v) => v)));
+                    var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+                    valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+                    var valueTypeList = complexType.AddProperty(
+                        "ValueTypeList",
+                        typeof(List<short>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeList.SetGetter(
+                        List<short> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(List<short>) : PrincipalBaseUnsafeAccessors.ValueTypeList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))),
+                        bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])) == null ? default(List<short>) : PrincipalBaseUnsafeAccessors.ValueTypeList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]])))) == null,
+                        List<short> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance),
+                        bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance) == null);
+                    valueTypeList.SetSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, List<short> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "ValueTypeList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                            return instance;
+                        });
+                    valueTypeList.SetMaterializationSetter(
+                        (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, IReadOnlyList<int> indices, List<short> value) =>
+                        {
+                            var level1 = (PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(entity))[indices[0]];
+                            if (level1 == null)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ComplexCollectionNullElementSetter("OwnedCollection.Principal#PrincipalBase (PrincipalBase)", "ValueTypeList", "PrincipalDerived<DependentBase<byte?>>", "ManyOwned", ((object)(indices[0]))));
+                            }
+
+                            var level2 = OwnedTypeUnsafeAccessors.Principal(level1);
+                            PrincipalBaseUnsafeAccessors.ValueTypeList(level2) = value;
+                        },
+                        CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                        {
+                            PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                            return instance;
+                        });
+                    valueTypeList.SetAccessors(
+                        List<short> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(List<short>) : PrincipalBaseUnsafeAccessors.ValueTypeList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        List<short> (IInternalEntry entry) => (((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])) == null ? default(List<short>) : PrincipalBaseUnsafeAccessors.ValueTypeList(((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]] == null ? default(CompiledModelTestBase.PrincipalBase) : OwnedTypeUnsafeAccessors.Principal((PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))) == null ? throw new InvalidOperationException(CoreStrings.ComplexCollectionNotInitialized("PrincipalDerived", "ManyOwned")) : PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.ManyOwned(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))))[entry.GetOrdinals()[0]])))),
+                        List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 24),
+                        List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+                    valueTypeList.SetPropertyIndexes(
+                        index: 23,
+                        originalValueIndex: 24,
+                        shadowIndex: -1,
+                        relationshipIndex: -1,
+                        storeGenerationIndex: -1);
+                    valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                        comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v)),
+                        keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                            bool (short v1, short v2) => v1 == v2,
+                            int (short v) => ((int)v),
+                            short (short v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            bool (string v1, string v2) => v1 == v2,
+                            int (string v) => ((object)v).GetHashCode(),
+                            string (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(255)",
+                            size: 255),
+                        converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                            JsonInt16ReaderWriter.Instance)),
+                        jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                            JsonInt16ReaderWriter.Instance),
+                        elementMapping: ShortTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<short>(
+                                bool (short v1, short v2) => v1 == v2,
+                                int (short v) => ((int)v),
+                                short (short v) => v),
+                            keyComparer: new ValueComparer<short>(
+                                bool (short v1, short v2) => v1 == v2,
+                                int (short v) => ((int)v),
+                                short (short v) => v),
+                            providerValueComparer: new ValueComparer<short>(
+                                bool (short v1, short v2) => v1 == v2,
+                                int (short v) => ((int)v),
+                                short (short v) => v)));
+                    var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+                    valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+                    complexType.AddAnnotation("Relational:FunctionName", null);
+                    complexType.AddAnnotation("Relational:Schema", null);
+                    complexType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+                    complexType.AddAnnotation("Relational:TableName", "PrincipalBase");
+                    complexType.AddAnnotation("Relational:ViewName", null);
+                    complexType.AddAnnotation("Relational:ViewSchema", null);
+                    return complexProperty;
+                }
+            }
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var discriminator = runtimeEntityType.FindProperty("Discriminator");
+            var enum1 = runtimeEntityType.FindProperty("Enum1");
+            var enum2 = runtimeEntityType.FindProperty("Enum2");
+            var flagsEnum1 = runtimeEntityType.FindProperty("FlagsEnum1");
+            var flagsEnum2 = runtimeEntityType.FindProperty("FlagsEnum2");
+            var principalBaseId = runtimeEntityType.FindProperty("PrincipalBaseId");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var owned = runtimeEntityType.FindComplexProperty("Owned");
+            var ownedType = owned.ComplexType;
+            var details = ownedType.FindProperty("Details");
+            var number = ownedType.FindProperty("Number");
+            var refTypeArray0 = ownedType.FindProperty("RefTypeArray");
+            var refTypeEnumerable0 = ownedType.FindProperty("RefTypeEnumerable");
+            var refTypeIList0 = ownedType.FindProperty("RefTypeIList");
+            var refTypeList0 = ownedType.FindProperty("RefTypeList");
+            var valueTypeArray0 = ownedType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable0 = ownedType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList0 = ownedType.FindProperty("ValueTypeIList");
+            var valueTypeList0 = ownedType.FindProperty("ValueTypeList");
+            var principal = ownedType.FindComplexProperty("Principal");
+            var principalBase = principal.ComplexType;
+            var alternateId = principalBase.FindProperty("AlternateId");
+            var enum10 = principalBase.FindProperty("Enum1");
+            var enum20 = principalBase.FindProperty("Enum2");
+            var flagsEnum10 = principalBase.FindProperty("FlagsEnum1");
+            var flagsEnum20 = principalBase.FindProperty("FlagsEnum2");
+            var id0 = principalBase.FindProperty("Id");
+            var refTypeArray1 = principalBase.FindProperty("RefTypeArray");
+            var refTypeEnumerable1 = principalBase.FindProperty("RefTypeEnumerable");
+            var refTypeIList1 = principalBase.FindProperty("RefTypeIList");
+            var refTypeList1 = principalBase.FindProperty("RefTypeList");
+            var valueTypeArray1 = principalBase.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable1 = principalBase.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList1 = principalBase.FindProperty("ValueTypeIList");
+            var valueTypeList1 = principalBase.FindProperty("ValueTypeList");
+            var manyOwned = runtimeEntityType.FindComplexProperty("ManyOwned");
+            var ownedCollection = manyOwned.ComplexType;
+            var details0 = ownedCollection.FindProperty("Details");
+            var number0 = ownedCollection.FindProperty("Number");
+            var refTypeArray2 = ownedCollection.FindProperty("RefTypeArray");
+            var refTypeEnumerable2 = ownedCollection.FindProperty("RefTypeEnumerable");
+            var refTypeIList2 = ownedCollection.FindProperty("RefTypeIList");
+            var refTypeList2 = ownedCollection.FindProperty("RefTypeList");
+            var valueTypeArray2 = ownedCollection.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable2 = ownedCollection.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList2 = ownedCollection.FindProperty("ValueTypeIList");
+            var valueTypeList2 = ownedCollection.FindProperty("ValueTypeList");
+            var principal0 = ownedCollection.FindComplexProperty("Principal");
+            var principalBase0 = principal0.ComplexType;
+            var alternateId0 = principalBase0.FindProperty("AlternateId");
+            var enum11 = principalBase0.FindProperty("Enum1");
+            var enum21 = principalBase0.FindProperty("Enum2");
+            var flagsEnum11 = principalBase0.FindProperty("FlagsEnum1");
+            var flagsEnum21 = principalBase0.FindProperty("FlagsEnum2");
+            var id1 = principalBase0.FindProperty("Id");
+            var refTypeArray3 = principalBase0.FindProperty("RefTypeArray");
+            var refTypeEnumerable3 = principalBase0.FindProperty("RefTypeEnumerable");
+            var refTypeIList3 = principalBase0.FindProperty("RefTypeIList");
+            var refTypeList3 = principalBase0.FindProperty("RefTypeList");
+            var valueTypeArray3 = principalBase0.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable3 = principalBase0.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList3 = principalBase0.FindProperty("ValueTypeIList");
+            var valueTypeList3 = principalBase0.FindProperty("ValueTypeList");
+            var deriveds = runtimeEntityType.FindNavigation("Deriveds");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType1 = ((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(source.Entity));
+                    var liftedArg0 = ((ISnapshot)(new Snapshot<long?, string, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum, CompiledModelTestBase.AFlagsEnum, long?, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>, string, int, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>, object, Guid, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), (source.GetCurrentValue<string>(discriminator) == null ? null : ((ValueComparer<string>)(((IProperty)discriminator).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(discriminator))), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1)), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2)), (source.GetCurrentValue<long?>(principalBaseId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalBaseId))), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))), (source.GetCurrentValue<string>(details) == null ? null : ((ValueComparer<string>)(((IProperty)details).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(details))), ((ValueComparer<int>)(((IProperty)number).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(number)), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray0))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray0).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray0))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable0))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable0).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable0))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList0))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList0).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList0))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList0))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList0).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList0))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray0))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray0).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray0))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable0) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable0).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable0))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList0))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList0).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList0))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList0))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList0).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList0))))))), ((object)(source.GetCurrentValue<CompiledModelTestBase.PrincipalBase>(principal))), ((ValueComparer<Guid>)(((IProperty)alternateId).GetValueComparer())).Snapshot(source.GetCurrentValue<Guid>(alternateId)), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum10).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum10)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum20) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum20).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum20))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum10).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum10)))));
+                    var structuralType2 = ((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(source.Entity));
+                    return ((ISnapshot)(new MultiSnapshot(new ISnapshot[] { liftedArg0, ((ISnapshot)(new Snapshot<CompiledModelTestBase.AFlagsEnum, long?, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>, object>(((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum20).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum20)), (source.GetCurrentValue<long?>(id0) == null ? null : ((ValueComparer<long?>)(((IProperty)id0).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id0))), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray1))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray1).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray1))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable1))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable1).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable1))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList1))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList1).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList1))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList1))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList1).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList1))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray1))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray1).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray1))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable1) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable1).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable1))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList1))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList1).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList1))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList1))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList1).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList1))))))), SnapshotFactoryFactory.SnapshotComplexCollection(((IList)(source.GetCurrentValue<IList<CompiledModelTestBase.OwnedType>>(manyOwned))), manyOwned)))) })));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long?, long?, string>((default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(default(long? ))), (default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(default(long? ))), (default(string) == null ? null : ((ValueComparer<string>)(((IProperty)details).GetValueComparer())).Snapshot(default(string)))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long?, long?, string>(default(long? ), default(long? ), default(string)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<string, long?>((source.ContainsKey("Discriminator") ? ((string)(source["Discriminator"])) : null), (source.ContainsKey("PrincipalBaseId") ? ((long? )(source["PrincipalBaseId"])) : null)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<string, long?>(default(string), default(long? )))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType3 = ((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, long?, object>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), (source.GetCurrentValue<long?>(principalBaseId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalBaseId))), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 39,
+                navigationCount: 1,
+                complexPropertyCount: 2,
+                complexCollectionCount: 1,
+                originalValueCount: 41,
+                shadowCount: 2,
+                relationshipCount: 3,
+                storeGeneratedCount: 3));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedUnsafeAccessors.cs
new file mode 100644
index 00000000..8d3af16d
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedUnsafeAccessors.cs
@@ -0,0 +1,17 @@
+// <auto-generated />
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class PrincipalDerivedUnsafeAccessors<TDependent>
+        where TDependent : class
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "ManyOwned")]
+        public static extern ref IList<CompiledModelTestBase.OwnedType> ManyOwned(CompiledModelTestBase.PrincipalDerived<TDependent> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextAssemblyAttributes.cs
new file mode 100644
index 00000000..188db793
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(CompiledModelRelationalTestBase.FunctionParameterTypeMappingContext), typeof(FunctionParameterTypeMappingContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModel.cs
new file mode 100644
index 00000000..3cd9c09d
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(CompiledModelRelationalTestBase.FunctionParameterTypeMappingContext))]
+    public partial class FunctionParameterTypeMappingContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static FunctionParameterTypeMappingContextModel()
+        {
+            var model = new FunctionParameterTypeMappingContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (FunctionParameterTypeMappingContextModel)model.FinalizeModel();
+        }
+
+        private static FunctionParameterTypeMappingContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs
new file mode 100644
index 00000000..a975dad2
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs
@@ -0,0 +1,103 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class FunctionParameterTypeMappingContextModel
+    {
+        private FunctionParameterTypeMappingContextModel()
+            : base(skipDetectChanges: true, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 0)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var functions = new Dictionary<string, IDbFunction>();
+            var getSqlFragmentStatic = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionParameterTypeMappingContext.GetSqlFragmentStatic(string)",
+                this,
+                typeof(string),
+                "GetSqlFragmentStatic",
+                storeType: "varchar(255)",
+                methodInfo: typeof(CompiledModelRelationalTestBase.FunctionParameterTypeMappingContext).GetMethod(
+                    "GetSqlFragmentStatic",
+                    BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(string) },
+                    null),
+                scalar: true,
+                nullable: true);
+
+            var param = getSqlFragmentStatic.AddParameter(
+                "param",
+                typeof(string),
+                false,
+                "varchar");
+            param.TypeMapping = StringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar",
+                    dbType: System.Data.DbType.AnsiString));
+
+            getSqlFragmentStatic.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionParameterTypeMappingContext.GetSqlFragmentStatic(string)"] = getSqlFragmentStatic;
+
+            AddAnnotation("Relational:DbFunctions", functions);
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+            var getSqlFragmentStatic = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionParameterTypeMappingContext.GetSqlFragmentStatic(string)")!;
+            var getSqlFragmentStaticFunction = new StoreFunction(getSqlFragmentStatic, relationalModel);
+            var paramFunctionParameter = getSqlFragmentStaticFunction.FindParameter("param")!;
+            relationalModel.Functions.Add(
+                ("GetSqlFragmentStatic", null, new[] { "varchar" }),
+                getSqlFragmentStaticFunction);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextAssemblyAttributes.cs
new file mode 100644
index 00000000..7ab16249
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(CompiledModelRelationalTestBase.FunctionTypeMappingContext), typeof(FunctionTypeMappingContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModel.cs
new file mode 100644
index 00000000..ead6c2fb
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(CompiledModelRelationalTestBase.FunctionTypeMappingContext))]
+    public partial class FunctionTypeMappingContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static FunctionTypeMappingContextModel()
+        {
+            var model = new FunctionTypeMappingContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (FunctionTypeMappingContextModel)model.FinalizeModel();
+        }
+
+        private static FunctionTypeMappingContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs
new file mode 100644
index 00000000..0826f5d3
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs
@@ -0,0 +1,103 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class FunctionTypeMappingContextModel
+    {
+        private FunctionTypeMappingContextModel()
+            : base(skipDetectChanges: true, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 0)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var functions = new Dictionary<string, IDbFunction>();
+            var getSqlFragmentStatic = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionTypeMappingContext.GetSqlFragmentStatic(string)",
+                this,
+                typeof(string),
+                "GetSqlFragmentStatic",
+                storeType: "varchar",
+                methodInfo: typeof(CompiledModelRelationalTestBase.FunctionTypeMappingContext).GetMethod(
+                    "GetSqlFragmentStatic",
+                    BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(string) },
+                    null),
+                scalar: true,
+                nullable: true);
+
+            var param = getSqlFragmentStatic.AddParameter(
+                "param",
+                typeof(string),
+                false,
+                "varchar(255)");
+            param.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            getSqlFragmentStatic.TypeMapping = StringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar",
+                    dbType: System.Data.DbType.AnsiString));
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionTypeMappingContext.GetSqlFragmentStatic(string)"] = getSqlFragmentStatic;
+
+            AddAnnotation("Relational:DbFunctions", functions);
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+            var getSqlFragmentStatic = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionTypeMappingContext.GetSqlFragmentStatic(string)")!;
+            var getSqlFragmentStaticFunction = new StoreFunction(getSqlFragmentStatic, relationalModel);
+            var paramFunctionParameter = getSqlFragmentStaticFunction.FindParameter("param")!;
+            relationalModel.Functions.Add(
+                ("GetSqlFragmentStatic", null, new[] { "varchar(255)" }),
+                getSqlFragmentStaticFunction);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataEntityType.cs
new file mode 100644
index 00000000..ff65213b
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataEntityType.cs
@@ -0,0 +1,124 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DataEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                typeof(CompiledModelTestBase.Data),
+                baseEntityType,
+                propertyCount: 1);
+
+            var blob = runtimeEntityType.AddProperty(
+                "Blob",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.Data).GetProperty("Blob", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.Data).GetField("<Blob>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            blob.SetGetter(
+                byte[] (CompiledModelTestBase.Data instance) => DataUnsafeAccessors.Blob(instance),
+                bool (CompiledModelTestBase.Data instance) => DataUnsafeAccessors.Blob(instance) == null);
+            blob.SetSetter(
+                CompiledModelTestBase.Data (CompiledModelTestBase.Data instance, byte[] value) =>
+                {
+                    DataUnsafeAccessors.Blob(instance) = value;
+                    return instance;
+                });
+            blob.SetMaterializationSetter(
+                CompiledModelTestBase.Data (CompiledModelTestBase.Data instance, byte[] value) =>
+                {
+                    DataUnsafeAccessors.Blob(instance) = value;
+                    return instance;
+                });
+            blob.SetAccessors(
+                byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
+                byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(blob, 0),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(blob));
+            blob.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            blob.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var blob = runtimeEntityType.FindProperty("Blob");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.Data)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<byte[]>((source.GetCurrentValue<byte[]>(blob) == null ? null : ((ValueComparer<byte[]>)(((IProperty)blob).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(blob))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => Snapshot.Empty);
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => Snapshot.Empty);
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) => Snapshot.Empty);
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 1,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 1,
+                shadowCount: 0,
+                relationshipCount: 0,
+                storeGeneratedCount: 0));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData()");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataUnsafeAccessors.cs
new file mode 100644
index 00000000..193c8970
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataUnsafeAccessors.cs
@@ -0,0 +1,16 @@
+// <auto-generated />
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DataUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Blob>k__BackingField")]
+        public static extern ref byte[] Blob(CompiledModelTestBase.Data @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextAssemblyAttributes.cs
new file mode 100644
index 00000000..a248efef
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(CompiledModelRelationalTestBase.DbFunctionContext), typeof(DbFunctionContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModel.cs
new file mode 100644
index 00000000..8d6f346c
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(CompiledModelRelationalTestBase.DbFunctionContext))]
+    public partial class DbFunctionContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbFunctionContextModel()
+        {
+            var model = new DbFunctionContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbFunctionContextModel)model.FinalizeModel();
+        }
+
+        private static DbFunctionContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs
new file mode 100644
index 00000000..3c61e23b
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs
@@ -0,0 +1,321 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbFunctionContextModel
+    {
+        private DbFunctionContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 2, typeConfigurationCount: 1)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var data = DataEntityType.Create(this);
+            var @object = ObjectEntityType.Create(this);
+
+            DataEntityType.CreateAnnotations(data);
+            ObjectEntityType.CreateAnnotations(@object);
+
+            var type = this.AddTypeMappingConfiguration(
+                typeof(string),
+                maxLength: 256);
+            type.AddAnnotation("Relational:IsFixedLength", true);
+
+            var functions = new Dictionary<string, IDbFunction>();
+            var getBlobs = new RuntimeDbFunction(
+                "GetBlobs()",
+                this,
+                typeof(IQueryable<object>),
+                "GetBlobs");
+
+            functions["GetBlobs()"] = getBlobs;
+
+            var getCount = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetCount(System.Guid?,string)",
+                this,
+                typeof(int),
+                "CustomerOrderCount",
+                schema: "dbf",
+                storeType: "integer",
+                methodInfo: typeof(CompiledModelRelationalTestBase.DbFunctionContext).GetMethod(
+                    "GetCount",
+                    BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(Guid?), typeof(string) },
+                    null),
+                scalar: true);
+
+            var id = getCount.AddParameter(
+                "id",
+                typeof(Guid?),
+                true,
+                "uniqueidentifier");
+            id.TypeMapping = JetGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    bool (Guid v1, Guid v2) => v1 == v2,
+                    int (Guid v) => ((object)v).GetHashCode(),
+                    Guid (Guid v) => v));
+            id.AddAnnotation("MyAnnotation", new[] { 1L });
+
+            var condition = getCount.AddParameter(
+                "condition",
+                typeof(string),
+                false,
+                "char(256)");
+            condition.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "char(256)",
+                    size: 256,
+                    fixedLength: true));
+
+            getCount.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetCount(System.Guid?,string)"] = getCount;
+
+            var getData = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData()",
+                this,
+                typeof(IQueryable<CompiledModelTestBase.Data>),
+                "GetAllData",
+                methodInfo: typeof(CompiledModelRelationalTestBase.DbFunctionContext).GetMethod(
+                    "GetData",
+                    BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] {  },
+                    null));
+
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData()"] = getData;
+
+            var getData0 = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData(int)",
+                this,
+                typeof(IQueryable<CompiledModelTestBase.Data>),
+                "GetData",
+                methodInfo: typeof(CompiledModelRelationalTestBase.DbFunctionContext).GetMethod(
+                    "GetData",
+                    BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(int) },
+                    null));
+
+            var id0 = getData0.AddParameter(
+                "id",
+                typeof(int),
+                false,
+                "integer");
+            id0.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData(int)"] = getData0;
+
+            var isDateStatic = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.IsDateStatic(string)",
+                this,
+                typeof(bool),
+                "IsDate",
+                storeType: "smallint",
+                methodInfo: typeof(CompiledModelRelationalTestBase.DbFunctionContext).GetMethod(
+                    "IsDateStatic",
+                    BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(string) },
+                    null),
+                scalar: true,
+                nullable: true,
+                builtIn: true);
+
+            var date = isDateStatic.AddParameter(
+                "date",
+                typeof(string),
+                false,
+                "char(256)");
+            date.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "char(256)",
+                    size: 256,
+                    fixedLength: true));
+
+            isDateStatic.TypeMapping = JetBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v));
+            isDateStatic.AddAnnotation("MyGuid", new Guid("00000000-0000-0000-0000-000000000000"));
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.IsDateStatic(string)"] = isDateStatic;
+
+            AddAnnotation("Relational:DbFunctions", functions);
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var data = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            data.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", null, relationalModel);
+            var blobColumnBase = new ColumnBase<ColumnMappingBase>("Blob", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Blob", blobColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase = new TableMappingBase<ColumnMappingBase>(data, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)blobColumnBase, data.FindProperty("Blob")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+
+            var functionMappings = new List<FunctionMapping>();
+            data.SetRuntimeAnnotation("Relational:FunctionMappings", functionMappings);
+            var getAllData = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData()")!;
+            var getAllDataFunction = new StoreFunction(getAllData, relationalModel);
+            var blobFunctionColumn = new FunctionColumn("Blob", "longbinary", getAllDataFunction)
+            {
+                IsNullable = true
+            };
+            getAllDataFunction.Columns.Add("Blob", blobFunctionColumn);
+            relationalModel.Functions.Add(
+                ("GetAllData", null, new string[0]),
+                getAllDataFunction);
+            var getAllDataFunctionMapping = new FunctionMapping(data, getAllDataFunction, getAllData, null);
+            getAllDataFunction.AddTypeMapping(getAllDataFunctionMapping, false);
+            functionMappings.Add(getAllDataFunctionMapping);
+            getAllDataFunctionMapping.IsDefaultFunctionMapping = true;
+            RelationalModel.CreateFunctionColumnMapping(blobFunctionColumn, data.FindProperty("Blob")!, getAllDataFunctionMapping);
+            var getData = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData(int)")!;
+            var getDataFunction = new StoreFunction(getData, relationalModel);
+            var idFunctionParameter = getDataFunction.FindParameter("id")!;
+            var blobFunctionColumn0 = new FunctionColumn("Blob", "longbinary", getDataFunction)
+            {
+                IsNullable = true
+            };
+            getDataFunction.Columns.Add("Blob", blobFunctionColumn0);
+            relationalModel.Functions.Add(
+                ("GetData", null, new[] { "integer" }),
+                getDataFunction);
+            var getDataFunctionMapping = new FunctionMapping(data, getDataFunction, getData, null);
+            getDataFunction.AddTypeMapping(getDataFunctionMapping, false);
+            functionMappings.Add(getDataFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(blobFunctionColumn0, data.FindProperty("Blob")!, getDataFunctionMapping);
+
+            var @object = FindEntityType("object")!;
+
+            var defaultTableMappings0 = new List<TableMappingBase<ColumnMappingBase>>();
+            @object.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings0);
+            var objectTableBase = new TableBase("object", null, relationalModel);
+            relationalModel.DefaultTables.Add("object", objectTableBase);
+            var objectMappingBase = new TableMappingBase<ColumnMappingBase>(@object, objectTableBase, null);
+            objectTableBase.AddTypeMapping(objectMappingBase, false);
+            defaultTableMappings0.Add(objectMappingBase);
+
+            var functionMappings0 = new List<FunctionMapping>();
+            @object.SetRuntimeAnnotation("Relational:FunctionMappings", functionMappings0);
+            var getBlobs = (IRuntimeDbFunction)this.FindDbFunction("GetBlobs()")!;
+            var getBlobsFunction = new StoreFunction(getBlobs, relationalModel);
+            relationalModel.Functions.Add(
+                ("GetBlobs", null, new string[0]),
+                getBlobsFunction);
+            var getBlobsFunctionMapping = new FunctionMapping(@object, getBlobsFunction, getBlobs, null);
+            getBlobsFunction.AddTypeMapping(getBlobsFunctionMapping, false);
+            functionMappings0.Add(getBlobsFunctionMapping);
+            getBlobsFunctionMapping.IsDefaultFunctionMapping = true;
+            var customerOrderCount = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetCount(System.Guid?,string)")!;
+            var customerOrderCountFunction = new StoreFunction(customerOrderCount, relationalModel);
+            var idFunctionParameter0 = customerOrderCountFunction.FindParameter("id")!;
+            var conditionFunctionParameter = customerOrderCountFunction.FindParameter("condition")!;
+            relationalModel.Functions.Add(
+                ("CustomerOrderCount", "dbf", new[] { "uniqueidentifier", "char(256)" }),
+                customerOrderCountFunction);
+            var isDate = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.IsDateStatic(string)")!;
+            var isDateFunction = new StoreFunction(isDate, relationalModel);
+            var dateFunctionParameter = isDateFunction.FindParameter("date")!;
+            relationalModel.Functions.Add(
+                ("IsDate", null, new[] { "char(256)" }),
+                isDateFunction);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/ObjectEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/ObjectEntityType.cs
new file mode 100644
index 00000000..9b854116
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/DbFunctions/ObjectEntityType.cs
@@ -0,0 +1,64 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class ObjectEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "object",
+                typeof(object),
+                baseEntityType,
+                propertyCount: 0);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) => Snapshot.Empty);
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => Snapshot.Empty);
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => Snapshot.Empty);
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) => Snapshot.Empty);
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 0,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 0,
+                shadowCount: 0,
+                relationshipCount: 0,
+                storeGeneratedCount: 0));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", "GetBlobs()");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataEntityType.cs
new file mode 100644
index 00000000..d1482abb
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataEntityType.cs
@@ -0,0 +1,171 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DataEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                typeof(CompiledModelTestBase.Data),
+                baseEntityType,
+                propertyCount: 2,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.SetAccessors(
+                int (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<int>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<int>(0) == 0 ? entry.ReadTemporaryValue<int>(0) : entry.ReadShadowValue<int>(0))),
+                int (IInternalEntry entry) => entry.ReadShadowValue<int>(0),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(id, 0),
+                int (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<int>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: 0,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            id.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<int>(id));
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var blob = runtimeEntityType.AddProperty(
+                "Blob",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.Data).GetProperty("Blob", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.Data).GetField("<Blob>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            blob.SetGetter(
+                byte[] (CompiledModelTestBase.Data instance) => DataUnsafeAccessors.Blob(instance),
+                bool (CompiledModelTestBase.Data instance) => DataUnsafeAccessors.Blob(instance) == null);
+            blob.SetSetter(
+                CompiledModelTestBase.Data (CompiledModelTestBase.Data instance, byte[] value) =>
+                {
+                    DataUnsafeAccessors.Blob(instance) = value;
+                    return instance;
+                });
+            blob.SetMaterializationSetter(
+                CompiledModelTestBase.Data (CompiledModelTestBase.Data instance, byte[] value) =>
+                {
+                    DataUnsafeAccessors.Blob(instance) = value;
+                    return instance;
+                });
+            blob.SetAccessors(
+                byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
+                byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(blob, 1),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(blob));
+            blob.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            blob.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var blob = runtimeEntityType.FindProperty("Blob");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNonNullableFactory<int>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<int>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.Data)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<int, byte[]>(((ValueComparer<int>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(id)), (source.GetCurrentValue<byte[]>(blob) == null ? null : ((ValueComparer<byte[]>)(((IProperty)blob).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(blob))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<int>(((ValueComparer<int>)(((IProperty)id).GetValueComparer())).Snapshot(default(int))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<int>(default(int)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<int>((source.ContainsKey("Id") ? ((int)(source["Id"])) : 0)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<int>(default(int)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.Data)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<int>(((ValueComparer<int>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<int>(id)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 2,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 2,
+                shadowCount: 1,
+                relationshipCount: 1,
+                storeGeneratedCount: 1));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Data");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataUnsafeAccessors.cs
new file mode 100644
index 00000000..193c8970
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataUnsafeAccessors.cs
@@ -0,0 +1,16 @@
+// <auto-generated />
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DataUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Blob>k__BackingField")]
+        public static extern ref byte[] Blob(CompiledModelTestBase.Data @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelBuilder.cs
new file mode 100644
index 00000000..4642044e
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelBuilder.cs
@@ -0,0 +1,88 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Update.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 1)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var data = DataEntityType.Create(this);
+
+            DataEntityType.CreateAnnotations(data);
+
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var data = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            data.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", null, relationalModel);
+            var blobColumnBase = new ColumnBase<ColumnMappingBase>("Blob", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Blob", blobColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Id", idColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase = new TableMappingBase<ColumnMappingBase>(data, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, data.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)blobColumnBase, data.FindProperty("Blob")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            data.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dataTable = new Table("Data", null, relationalModel);
+            var idColumn = new Column("Id", "integer", dataTable);
+            dataTable.Columns.Add("Id", idColumn);
+            idColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(idColumn);
+            idColumn.AddAnnotation("Jet:Identity", "1, 1");
+            var blobColumn = new Column("Blob", "longbinary", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("Blob", blobColumn);
+            blobColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(blobColumn);
+            relationalModel.Tables.Add(("Data", null), dataTable);
+            var dataTableMapping = new TableMapping(data, dataTable, null);
+            dataTable.AddTypeMapping(dataTableMapping, false);
+            tableMappings.Add(dataTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, data.FindProperty("Id")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(blobColumn, data.FindProperty("Blob")!, dataTableMapping);
+            var pK_Data = new UniqueConstraint("PK_Data", dataTable, new[] { idColumn });
+            dataTable.PrimaryKey = pK_Data;
+            pK_Data.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<int>(pK_Data));
+            var pK_DataKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                new[] { "Id" });
+            pK_Data.MappedKeys.Add(pK_DataKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DataKey).Add(pK_Data);
+            dataTable.UniqueConstraints.Add("PK_Data", pK_Data);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DbContextModelBuilder.cs
new file mode 100644
index 00000000..faca8146
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DbContextModelBuilder.cs
@@ -0,0 +1,57 @@
+// <auto-generated />
+using System;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 8)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var dependentBase = DependentBaseEntityType.Create(this);
+            var manyTypes = ManyTypesEntityType.Create(this);
+            var principalBase = PrincipalBaseEntityType.Create(this);
+            var ownedType = OwnedTypeEntityType.Create(this);
+            var ownedType0 = OwnedType0EntityType.Create(this);
+            var principalBasePrincipalDerivedDependentBasebyte = PrincipalBasePrincipalDerivedDependentBasebyteEntityType.Create(this);
+            var dependentDerived = DependentDerivedEntityType.Create(this, dependentBase);
+            var principalDerived = PrincipalDerivedEntityType.Create(this, principalBase);
+
+            DependentBaseEntityType.CreateForeignKey1(dependentBase, principalBase);
+            DependentBaseEntityType.CreateForeignKey2(dependentBase, principalDerived);
+            OwnedTypeEntityType.CreateForeignKey1(ownedType, principalBase);
+            OwnedTypeEntityType.CreateForeignKey2(ownedType, ownedType);
+            OwnedType0EntityType.CreateForeignKey1(ownedType0, principalDerived);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateForeignKey1(principalBasePrincipalDerivedDependentBasebyte, principalDerived);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateForeignKey2(principalBasePrincipalDerivedDependentBasebyte, principalBase);
+            PrincipalDerivedEntityType.CreateForeignKey1(principalDerived, principalBase);
+
+            PrincipalBaseEntityType.CreateSkipNavigation1(principalBase, principalDerived, principalBasePrincipalDerivedDependentBasebyte);
+            PrincipalDerivedEntityType.CreateSkipNavigation1(principalDerived, principalBase, principalBasePrincipalDerivedDependentBasebyte);
+
+            DependentBaseEntityType.CreateAnnotations(dependentBase);
+            ManyTypesEntityType.CreateAnnotations(manyTypes);
+            PrincipalBaseEntityType.CreateAnnotations(principalBase);
+            OwnedTypeEntityType.CreateAnnotations(ownedType);
+            OwnedType0EntityType.CreateAnnotations(ownedType0);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateAnnotations(principalBasePrincipalDerivedDependentBasebyte);
+            DependentDerivedEntityType.CreateAnnotations(dependentDerived);
+            PrincipalDerivedEntityType.CreateAnnotations(principalDerived);
+
+            AddAnnotation("Jet:IdentityIncrement", 2);
+            AddAnnotation("Jet:IdentitySeed", 3);
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DependentBaseEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DependentBaseEntityType.cs
new file mode 100644
index 00000000..c6a49c61
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DependentBaseEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.ValueGeneration;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DependentBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                baseEntityType,
+                discriminatorProperty: "EnumDiscriminator",
+                discriminatorValue: CompiledModelTestBase.Enum1.One,
+                derivedTypesCount: 1,
+                propertyCount: 4,
+                navigationCount: 1,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var principalId = runtimeEntityType.AddProperty(
+                "PrincipalId",
+                typeof(long),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+            principalId.SetSentinelFromProviderValue(0);
+
+            var principalAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalAlternateId",
+                typeof(Guid),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+
+            var enumDiscriminator = runtimeEntityType.AddProperty(
+                "EnumDiscriminator",
+                typeof(CompiledModelTestBase.Enum1),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                valueGeneratorFactory: new DiscriminatorValueGeneratorFactory().Create);
+            enumDiscriminator.SetSentinelFromProviderValue(0);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Id", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalId, principalAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalId },
+                unique: true);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId"), declaringEntityType.FindProperty("PrincipalAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.ClientNoAction,
+                unique: true,
+                required: true);
+
+            var principal = declaringEntityType.AddNavigation("Principal",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Principal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Principal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dependent = principalEntityType.AddNavigation("Dependent",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Dependent", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Dependent>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true,
+                lazyLoadingEnabled: false);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("DiscriminatorMappingComplete", false);
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPH");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DependentDerivedEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DependentDerivedEntityType.cs
new file mode 100644
index 00000000..ee41508b
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/DependentDerivedEntityType.cs
@@ -0,0 +1,60 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DependentDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<byte?>",
+                typeof(CompiledModelTestBase.DependentDerived<byte?>),
+                baseEntityType,
+                discriminatorProperty: "EnumDiscriminator",
+                discriminatorValue: CompiledModelTestBase.Enum1.Two,
+                propertyCount: 2);
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.DependentDerived<byte?>).GetProperty("Data", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentDerived<byte?>).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 20,
+                unicode: false);
+            data.AddAnnotation("Relational:IsFixedLength", true);
+
+            var money = runtimeEntityType.AddProperty(
+                "Money",
+                typeof(decimal),
+                precision: 9,
+                scale: 3,
+                sentinel: 0m);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/ManyTypesEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/ManyTypesEntityType.cs
new file mode 100644
index 00000000..0616d04f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/ManyTypesEntityType.cs
@@ -0,0 +1,1876 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Reflection;
+using System.Text;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class ManyTypesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes",
+                typeof(CompiledModelTestBase.ManyTypes),
+                baseEntityType,
+                propertyCount: 241,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(CompiledModelTestBase.ManyTypesId),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                valueConverter: new CompiledModelTestBase.ManyTypesIdConverter());
+            id.SetSentinelFromProviderValue(0);
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var @bool = runtimeEntityType.AddProperty(
+                "Bool",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Bool", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Bool>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: false);
+
+            var boolArray = runtimeEntityType.AddProperty(
+                "BoolArray",
+                typeof(bool[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var boolArrayElementType = boolArray.SetElementType(typeof(bool));
+
+            var boolReadOnlyCollection = runtimeEntityType.AddProperty(
+                "BoolReadOnlyCollection",
+                typeof(IReadOnlyCollection<bool>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_boolReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var boolReadOnlyCollectionElementType = boolReadOnlyCollection.SetElementType(typeof(bool));
+
+            var boolToStringConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToStringConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolToStringConverterProperty.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    bool (bool v1, bool v2) => v1 == v2,
+                    int (bool v) => ((object)v).GetHashCode(),
+                    bool (bool v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<bool, string>(
+                    string (bool v) => ((string)((v ? "B" : "A"))),
+                    bool (string v) => !(string.IsNullOrEmpty(v)) && ((int)(v.ToUpperInvariant()[0])) == ((int)("B".ToUpperInvariant()[0]))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<bool, string>(
+                        string (bool v) => ((string)((v ? "B" : "A"))),
+                        bool (string v) => !(string.IsNullOrEmpty(v)) && ((int)(v.ToUpperInvariant()[0])) == ((int)("B".ToUpperInvariant()[0])))));
+            boolToStringConverterProperty.SetSentinelFromProviderValue("A");
+
+            var boolToTwoValuesConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToTwoValuesConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToTwoValuesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToTwoValuesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolToTwoValuesConverterProperty.SetValueConverter(new ValueConverter<bool, byte>(
+                byte (bool v) => ((byte)((v ? 1 : 0))),
+                bool (byte v) => v == 1));
+            boolToTwoValuesConverterProperty.SetSentinelFromProviderValue((byte)0);
+
+            var boolToZeroOneConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToZeroOneConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToZeroOneConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToZeroOneConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new BoolToZeroOneConverter<short>());
+            boolToZeroOneConverterProperty.SetSentinelFromProviderValue((short)0);
+
+            var bytes = runtimeEntityType.AddProperty(
+                "Bytes",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Bytes", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Bytes>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var bytesArray = runtimeEntityType.AddProperty(
+                "BytesArray",
+                typeof(byte[][]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BytesArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BytesArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var bytesArrayElementType = bytesArray.SetElementType(typeof(byte[]));
+
+            var bytesToStringConverterProperty = runtimeEntityType.AddProperty(
+                "BytesToStringConverterProperty",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BytesToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BytesToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new BytesToStringConverter(),
+                valueComparer: new ArrayStructuralComparer<byte>());
+
+            var castingConverterProperty = runtimeEntityType.AddProperty(
+                "CastingConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CastingConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CastingConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new CastingConverter<int, decimal>());
+            castingConverterProperty.SetSentinelFromProviderValue(0m);
+
+            var @char = runtimeEntityType.AddProperty(
+                "Char",
+                typeof(char),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Char", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Char>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            @char.SetSentinelFromProviderValue("\0");
+
+            var charArray = runtimeEntityType.AddProperty(
+                "CharArray",
+                typeof(char[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CharArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CharArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var charArrayElementType = charArray.SetElementType(typeof(char));
+
+            var charToStringConverterProperty = runtimeEntityType.AddProperty(
+                "CharToStringConverterProperty",
+                typeof(char),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CharToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CharToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new CharToStringConverter());
+            charToStringConverterProperty.SetSentinelFromProviderValue("\0");
+            charToStringConverterProperty.AddAnnotation("Relational:IsFixedLength", true);
+
+            var dateOnly = runtimeEntityType.AddProperty(
+                "DateOnly",
+                typeof(DateOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateOnly(1, 1, 1));
+
+            var dateOnlyArray = runtimeEntityType.AddProperty(
+                "DateOnlyArray",
+                typeof(DateOnly[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var dateOnlyArrayElementType = dateOnlyArray.SetElementType(typeof(DateOnly));
+
+            var dateOnlyToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateOnlyToStringConverterProperty",
+                typeof(DateOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnlyToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnlyToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateOnlyToStringConverter());
+            dateOnlyToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01");
+
+            var dateTime = runtimeEntityType.AddProperty(
+                "DateTime",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            var dateTimeArray = runtimeEntityType.AddProperty(
+                "DateTimeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var dateTimeArrayElementType = dateTimeArray.SetElementType(typeof(DateTime));
+
+            var dateTimeOffsetToBinaryConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToBinaryConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToBinaryConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToBinaryConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToBinaryConverter());
+            dateTimeOffsetToBinaryConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var dateTimeOffsetToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToBytesConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToBytesConverter());
+            dateTimeOffsetToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var dateTimeOffsetToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToStringConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToStringConverter());
+            dateTimeOffsetToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01 00:00:00+00:00");
+
+            var dateTimeToBinaryConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToBinaryConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToBinaryConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToBinaryConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeToBinaryConverter());
+            dateTimeToBinaryConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var dateTimeToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToStringConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeToStringConverter());
+            dateTimeToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01 00:00:00");
+
+            var dateTimeToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToTicksConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            var @decimal = runtimeEntityType.AddProperty(
+                "Decimal",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Decimal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Decimal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0m);
+
+            var decimalArray = runtimeEntityType.AddProperty(
+                "DecimalArray",
+                typeof(decimal[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var decimalArrayElementType = decimalArray.SetElementType(typeof(decimal));
+
+            var decimalNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DecimalNumberToBytesConverterProperty",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<decimal>());
+            decimalNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var decimalNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DecimalNumberToStringConverterProperty",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<decimal>());
+            decimalNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+
+            var @double = runtimeEntityType.AddProperty(
+                "Double",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Double", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Double>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0.0);
+
+            var doubleArray = runtimeEntityType.AddProperty(
+                "DoubleArray",
+                typeof(double[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var doubleArrayElementType = doubleArray.SetElementType(typeof(double));
+
+            var doubleNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DoubleNumberToBytesConverterProperty",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<double>());
+            doubleNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var doubleNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DoubleNumberToStringConverterProperty",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<double>());
+            doubleNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+
+            var enum16 = runtimeEntityType.AddProperty(
+                "Enum16",
+                typeof(CompiledModelTestBase.Enum16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16.SetSentinelFromProviderValue((short)0);
+
+            var enum16Array = runtimeEntityType.AddProperty(
+                "Enum16Array",
+                typeof(CompiledModelTestBase.Enum16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum16ArrayElementType = enum16Array.SetElementType(typeof(CompiledModelTestBase.Enum16));
+
+            var enum16AsString = runtimeEntityType.AddProperty(
+                "Enum16AsString",
+                typeof(CompiledModelTestBase.Enum16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum16AsString.SetSentinelFromProviderValue("Default");
+
+            var enum16AsStringArray = runtimeEntityType.AddProperty(
+                "Enum16AsStringArray",
+                typeof(CompiledModelTestBase.Enum16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum16AsStringArrayElementType = enum16AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum16),
+                providerClrType: typeof(string));
+
+            var enum16AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum16AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum16AsStringCollectionElementType = enum16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum16),
+                providerClrType: typeof(string));
+
+            var enum16Collection = runtimeEntityType.AddProperty(
+                "Enum16Collection",
+                typeof(List<CompiledModelTestBase.Enum16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum16CollectionElementType = enum16Collection.SetElementType(typeof(CompiledModelTestBase.Enum16));
+
+            var enum32 = runtimeEntityType.AddProperty(
+                "Enum32",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32.SetSentinelFromProviderValue(0);
+
+            var enum32Array = runtimeEntityType.AddProperty(
+                "Enum32Array",
+                typeof(CompiledModelTestBase.Enum32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum32ArrayElementType = enum32Array.SetElementType(typeof(CompiledModelTestBase.Enum32));
+
+            var enum32AsString = runtimeEntityType.AddProperty(
+                "Enum32AsString",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum32AsString.SetSentinelFromProviderValue("Default");
+
+            var enum32AsStringArray = runtimeEntityType.AddProperty(
+                "Enum32AsStringArray",
+                typeof(CompiledModelTestBase.Enum32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum32AsStringArrayElementType = enum32AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum32),
+                providerClrType: typeof(string));
+
+            var enum32AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum32AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum32AsStringCollectionElementType = enum32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum32),
+                providerClrType: typeof(string));
+
+            var enum32Collection = runtimeEntityType.AddProperty(
+                "Enum32Collection",
+                typeof(List<CompiledModelTestBase.Enum32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum32CollectionElementType = enum32Collection.SetElementType(typeof(CompiledModelTestBase.Enum32));
+
+            var enum64 = runtimeEntityType.AddProperty(
+                "Enum64",
+                typeof(CompiledModelTestBase.Enum64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64.SetSentinelFromProviderValue(0L);
+
+            var enum64Array = runtimeEntityType.AddProperty(
+                "Enum64Array",
+                typeof(CompiledModelTestBase.Enum64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum64ArrayElementType = enum64Array.SetElementType(typeof(CompiledModelTestBase.Enum64));
+
+            var enum64AsString = runtimeEntityType.AddProperty(
+                "Enum64AsString",
+                typeof(CompiledModelTestBase.Enum64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum64AsString.SetSentinelFromProviderValue("Default");
+
+            var enum64AsStringArray = runtimeEntityType.AddProperty(
+                "Enum64AsStringArray",
+                typeof(CompiledModelTestBase.Enum64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum64AsStringArrayElementType = enum64AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum64),
+                providerClrType: typeof(string));
+
+            var enum64AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum64AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum64AsStringCollectionElementType = enum64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum64),
+                providerClrType: typeof(string));
+
+            var enum64Collection = runtimeEntityType.AddProperty(
+                "Enum64Collection",
+                typeof(List<CompiledModelTestBase.Enum64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum64CollectionElementType = enum64Collection.SetElementType(typeof(CompiledModelTestBase.Enum64));
+
+            var enum8 = runtimeEntityType.AddProperty(
+                "Enum8",
+                typeof(CompiledModelTestBase.Enum8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8.SetSentinelFromProviderValue((short)0);
+
+            var enum8Array = runtimeEntityType.AddProperty(
+                "Enum8Array",
+                typeof(CompiledModelTestBase.Enum8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum8ArrayElementType = enum8Array.SetElementType(typeof(CompiledModelTestBase.Enum8));
+
+            var enum8AsString = runtimeEntityType.AddProperty(
+                "Enum8AsString",
+                typeof(CompiledModelTestBase.Enum8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum8AsString.SetSentinelFromProviderValue("Default");
+
+            var enum8AsStringArray = runtimeEntityType.AddProperty(
+                "Enum8AsStringArray",
+                typeof(CompiledModelTestBase.Enum8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum8AsStringArrayElementType = enum8AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum8),
+                providerClrType: typeof(string));
+
+            var enum8AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum8AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum8AsStringCollectionElementType = enum8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum8),
+                providerClrType: typeof(string));
+
+            var enum8Collection = runtimeEntityType.AddProperty(
+                "Enum8Collection",
+                typeof(List<CompiledModelTestBase.Enum8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enum8CollectionElementType = enum8Collection.SetElementType(typeof(CompiledModelTestBase.Enum8));
+
+            var enumToNumberConverterProperty = runtimeEntityType.AddProperty(
+                "EnumToNumberConverterProperty",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumToNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumToNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new EnumToNumberConverter<CompiledModelTestBase.Enum32, int>());
+            enumToNumberConverterProperty.SetSentinelFromProviderValue(0);
+
+            var enumToStringConverterProperty = runtimeEntityType.AddProperty(
+                "EnumToStringConverterProperty",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new EnumToStringConverter<CompiledModelTestBase.Enum32>());
+            enumToStringConverterProperty.SetSentinelFromProviderValue("Default");
+
+            var enumU16 = runtimeEntityType.AddProperty(
+                "EnumU16",
+                typeof(CompiledModelTestBase.EnumU16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16.SetSentinelFromProviderValue(0);
+
+            var enumU16Array = runtimeEntityType.AddProperty(
+                "EnumU16Array",
+                typeof(CompiledModelTestBase.EnumU16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU16ArrayElementType = enumU16Array.SetElementType(typeof(CompiledModelTestBase.EnumU16));
+
+            var enumU16AsString = runtimeEntityType.AddProperty(
+                "EnumU16AsString",
+                typeof(CompiledModelTestBase.EnumU16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU16AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU16AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU16AsStringArray",
+                typeof(CompiledModelTestBase.EnumU16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU16AsStringArrayElementType = enumU16AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU16),
+                providerClrType: typeof(string));
+
+            var enumU16AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU16AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU16AsStringCollectionElementType = enumU16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU16),
+                providerClrType: typeof(string));
+
+            var enumU16Collection = runtimeEntityType.AddProperty(
+                "EnumU16Collection",
+                typeof(List<CompiledModelTestBase.EnumU16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU16CollectionElementType = enumU16Collection.SetElementType(typeof(CompiledModelTestBase.EnumU16));
+
+            var enumU32 = runtimeEntityType.AddProperty(
+                "EnumU32",
+                typeof(CompiledModelTestBase.EnumU32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32.SetSentinelFromProviderValue(0L);
+
+            var enumU32Array = runtimeEntityType.AddProperty(
+                "EnumU32Array",
+                typeof(CompiledModelTestBase.EnumU32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU32ArrayElementType = enumU32Array.SetElementType(typeof(CompiledModelTestBase.EnumU32));
+
+            var enumU32AsString = runtimeEntityType.AddProperty(
+                "EnumU32AsString",
+                typeof(CompiledModelTestBase.EnumU32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU32AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU32AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU32AsStringArray",
+                typeof(CompiledModelTestBase.EnumU32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU32AsStringArrayElementType = enumU32AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU32),
+                providerClrType: typeof(string));
+
+            var enumU32AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU32AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU32AsStringCollectionElementType = enumU32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU32),
+                providerClrType: typeof(string));
+
+            var enumU32Collection = runtimeEntityType.AddProperty(
+                "EnumU32Collection",
+                typeof(List<CompiledModelTestBase.EnumU32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU32CollectionElementType = enumU32Collection.SetElementType(typeof(CompiledModelTestBase.EnumU32));
+
+            var enumU64 = runtimeEntityType.AddProperty(
+                "EnumU64",
+                typeof(CompiledModelTestBase.EnumU64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64.SetSentinelFromProviderValue(0m);
+
+            var enumU64Array = runtimeEntityType.AddProperty(
+                "EnumU64Array",
+                typeof(CompiledModelTestBase.EnumU64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU64ArrayElementType = enumU64Array.SetElementType(typeof(CompiledModelTestBase.EnumU64));
+
+            var enumU64AsString = runtimeEntityType.AddProperty(
+                "EnumU64AsString",
+                typeof(CompiledModelTestBase.EnumU64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU64AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU64AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU64AsStringArray",
+                typeof(CompiledModelTestBase.EnumU64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU64AsStringArrayElementType = enumU64AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU64),
+                providerClrType: typeof(string));
+
+            var enumU64AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU64AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU64AsStringCollectionElementType = enumU64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU64),
+                providerClrType: typeof(string));
+
+            var enumU64Collection = runtimeEntityType.AddProperty(
+                "EnumU64Collection",
+                typeof(List<CompiledModelTestBase.EnumU64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU64CollectionElementType = enumU64Collection.SetElementType(typeof(CompiledModelTestBase.EnumU64));
+
+            var enumU8 = runtimeEntityType.AddProperty(
+                "EnumU8",
+                typeof(CompiledModelTestBase.EnumU8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8.SetSentinelFromProviderValue((byte)0);
+
+            var enumU8Array = runtimeEntityType.AddProperty(
+                "EnumU8Array",
+                typeof(CompiledModelTestBase.EnumU8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU8ArrayElementType = enumU8Array.SetElementType(typeof(CompiledModelTestBase.EnumU8));
+
+            var enumU8AsString = runtimeEntityType.AddProperty(
+                "EnumU8AsString",
+                typeof(CompiledModelTestBase.EnumU8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU8AsString.SetSentinelFromProviderValue("Min");
+
+            var enumU8AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU8AsStringArray",
+                typeof(CompiledModelTestBase.EnumU8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU8AsStringArrayElementType = enumU8AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU8),
+                providerClrType: typeof(string));
+
+            var enumU8AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU8AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU8AsStringCollectionElementType = enumU8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU8),
+                providerClrType: typeof(string));
+
+            var enumU8Collection = runtimeEntityType.AddProperty(
+                "EnumU8Collection",
+                typeof(List<CompiledModelTestBase.EnumU8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var enumU8CollectionElementType = enumU8Collection.SetElementType(typeof(CompiledModelTestBase.EnumU8));
+
+            var @float = runtimeEntityType.AddProperty(
+                "Float",
+                typeof(float),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Float", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Float>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0f);
+
+            var floatArray = runtimeEntityType.AddProperty(
+                "FloatArray",
+                typeof(float[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("FloatArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<FloatArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var floatArrayElementType = floatArray.SetElementType(typeof(float));
+
+            var guid = runtimeEntityType.AddProperty(
+                "Guid",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Guid", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Guid>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+
+            var guidArray = runtimeEntityType.AddProperty(
+                "GuidArray",
+                typeof(Guid[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var guidArrayElementType = guidArray.SetElementType(typeof(Guid));
+
+            var guidToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "GuidToBytesConverterProperty",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new GuidToBytesConverter());
+            guidToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            var guidToStringConverterProperty = runtimeEntityType.AddProperty(
+                "GuidToStringConverterProperty",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new GuidToStringConverter());
+            guidToStringConverterProperty.SetSentinelFromProviderValue("00000000-0000-0000-0000-000000000000");
+
+            var iPAddress = runtimeEntityType.AddProperty(
+                "IPAddress",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var iPAddressArray = runtimeEntityType.AddProperty(
+                "IPAddressArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var iPAddressArrayElementType = iPAddressArray.SetElementType(typeof(IPAddress));
+
+            var iPAddressReadOnlyCollection = runtimeEntityType.AddProperty(
+                "IPAddressReadOnlyCollection",
+                typeof(IReadOnlyCollection<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_ipAddressReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var iPAddressReadOnlyCollectionElementType = iPAddressReadOnlyCollection.SetElementType(typeof(IPAddress),
+                providerClrType: typeof(string));
+
+            var iPAddressToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "IPAddressToBytesConverterProperty",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new IPAddressToBytesConverter());
+
+            var iPAddressToStringConverterProperty = runtimeEntityType.AddProperty(
+                "IPAddressToStringConverterProperty",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new IPAddressToStringConverter());
+
+            var int16 = runtimeEntityType.AddProperty(
+                "Int16",
+                typeof(short),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (short)0);
+
+            var int16Array = runtimeEntityType.AddProperty(
+                "Int16Array",
+                typeof(short[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var int16ArrayElementType = int16Array.SetElementType(typeof(short));
+
+            var int32 = runtimeEntityType.AddProperty(
+                "Int32",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0);
+
+            var int32Array = runtimeEntityType.AddProperty(
+                "Int32Array",
+                typeof(int[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var int32ArrayElementType = int32Array.SetElementType(typeof(int));
+
+            var int32ReadOnlyCollection = runtimeEntityType.AddProperty(
+                "Int32ReadOnlyCollection",
+                typeof(IReadOnlyCollection<int>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32ReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_int32ReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var int32ReadOnlyCollectionElementType = int32ReadOnlyCollection.SetElementType(typeof(int));
+
+            var int64 = runtimeEntityType.AddProperty(
+                "Int64",
+                typeof(long),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0L);
+
+            var int64Array = runtimeEntityType.AddProperty(
+                "Int64Array",
+                typeof(long[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var int64ArrayElementType = int64Array.SetElementType(typeof(long));
+
+            var int8 = runtimeEntityType.AddProperty(
+                "Int8",
+                typeof(sbyte),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int8.SetSentinelFromProviderValue((short)0);
+
+            var int8Array = runtimeEntityType.AddProperty(
+                "Int8Array",
+                typeof(sbyte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var int8ArrayElementType = int8Array.SetElementType(typeof(sbyte));
+
+            var intNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "IntNumberToBytesConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IntNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IntNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<int>());
+            intNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0 });
+
+            var intNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "IntNumberToStringConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IntNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IntNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<int>());
+            intNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+
+            var nullIntToNullStringConverterProperty = runtimeEntityType.AddProperty(
+                "NullIntToNullStringConverterProperty",
+                typeof(int?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullIntToNullStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullIntToNullStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                valueConverter: new CompiledModelTestBase.NullIntToNullStringConverter());
+
+            var nullableBool = runtimeEntityType.AddProperty(
+                "NullableBool",
+                typeof(bool?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBool", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBool>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableBoolArray = runtimeEntityType.AddProperty(
+                "NullableBoolArray",
+                typeof(bool?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBoolArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBoolArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableBoolArrayElementType = nullableBoolArray.SetElementType(typeof(bool?),
+                nullable: true);
+
+            var nullableBytes = runtimeEntityType.AddProperty(
+                "NullableBytes",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBytes", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBytes>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableBytesArray = runtimeEntityType.AddProperty(
+                "NullableBytesArray",
+                typeof(byte[][]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBytesArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBytesArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableBytesArrayElementType = nullableBytesArray.SetElementType(typeof(byte[]),
+                nullable: true);
+
+            var nullableChar = runtimeEntityType.AddProperty(
+                "NullableChar",
+                typeof(char?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableChar", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableChar>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableCharArray = runtimeEntityType.AddProperty(
+                "NullableCharArray",
+                typeof(char?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableCharArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableCharArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableCharArrayElementType = nullableCharArray.SetElementType(typeof(char?),
+                nullable: true);
+
+            var nullableDateOnly = runtimeEntityType.AddProperty(
+                "NullableDateOnly",
+                typeof(DateOnly?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableDateOnlyArray = runtimeEntityType.AddProperty(
+                "NullableDateOnlyArray",
+                typeof(DateOnly?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableDateOnlyArrayElementType = nullableDateOnlyArray.SetElementType(typeof(DateOnly?),
+                nullable: true);
+
+            var nullableDateTime = runtimeEntityType.AddProperty(
+                "NullableDateTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableDateTimeArray = runtimeEntityType.AddProperty(
+                "NullableDateTimeArray",
+                typeof(DateTime?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateTimeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateTimeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableDateTimeArrayElementType = nullableDateTimeArray.SetElementType(typeof(DateTime?),
+                nullable: true);
+
+            var nullableDecimal = runtimeEntityType.AddProperty(
+                "NullableDecimal",
+                typeof(decimal?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDecimal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDecimal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableDecimalArray = runtimeEntityType.AddProperty(
+                "NullableDecimalArray",
+                typeof(decimal?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDecimalArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDecimalArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableDecimalArrayElementType = nullableDecimalArray.SetElementType(typeof(decimal?),
+                nullable: true);
+
+            var nullableDouble = runtimeEntityType.AddProperty(
+                "NullableDouble",
+                typeof(double?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDouble", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDouble>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableDoubleArray = runtimeEntityType.AddProperty(
+                "NullableDoubleArray",
+                typeof(double?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDoubleArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDoubleArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableDoubleArrayElementType = nullableDoubleArray.SetElementType(typeof(double?),
+                nullable: true);
+
+            var nullableEnum16 = runtimeEntityType.AddProperty(
+                "NullableEnum16",
+                typeof(CompiledModelTestBase.Enum16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnum16Array = runtimeEntityType.AddProperty(
+                "NullableEnum16Array",
+                typeof(CompiledModelTestBase.Enum16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum16ArrayElementType = nullableEnum16Array.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+
+            var nullableEnum16AsString = runtimeEntityType.AddProperty(
+                "NullableEnum16AsString",
+                typeof(CompiledModelTestBase.Enum16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnum16AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum16AsStringArray",
+                typeof(CompiledModelTestBase.Enum16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum16AsStringArrayElementType = nullableEnum16AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+
+            var nullableEnum16AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum16AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum16AsStringCollectionElementType = nullableEnum16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+
+            var nullableEnum16Collection = runtimeEntityType.AddProperty(
+                "NullableEnum16Collection",
+                typeof(List<CompiledModelTestBase.Enum16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum16CollectionElementType = nullableEnum16Collection.SetElementType(typeof(CompiledModelTestBase.Enum16?),
+                nullable: true);
+
+            var nullableEnum32 = runtimeEntityType.AddProperty(
+                "NullableEnum32",
+                typeof(CompiledModelTestBase.Enum32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnum32Array = runtimeEntityType.AddProperty(
+                "NullableEnum32Array",
+                typeof(CompiledModelTestBase.Enum32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum32ArrayElementType = nullableEnum32Array.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+
+            var nullableEnum32AsString = runtimeEntityType.AddProperty(
+                "NullableEnum32AsString",
+                typeof(CompiledModelTestBase.Enum32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnum32AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum32AsStringArray",
+                typeof(CompiledModelTestBase.Enum32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum32AsStringArrayElementType = nullableEnum32AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+
+            var nullableEnum32AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum32AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum32AsStringCollectionElementType = nullableEnum32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+
+            var nullableEnum32Collection = runtimeEntityType.AddProperty(
+                "NullableEnum32Collection",
+                typeof(List<CompiledModelTestBase.Enum32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum32CollectionElementType = nullableEnum32Collection.SetElementType(typeof(CompiledModelTestBase.Enum32?),
+                nullable: true);
+
+            var nullableEnum64 = runtimeEntityType.AddProperty(
+                "NullableEnum64",
+                typeof(CompiledModelTestBase.Enum64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnum64Array = runtimeEntityType.AddProperty(
+                "NullableEnum64Array",
+                typeof(CompiledModelTestBase.Enum64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum64ArrayElementType = nullableEnum64Array.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+
+            var nullableEnum64AsString = runtimeEntityType.AddProperty(
+                "NullableEnum64AsString",
+                typeof(CompiledModelTestBase.Enum64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnum64AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum64AsStringArray",
+                typeof(CompiledModelTestBase.Enum64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum64AsStringArrayElementType = nullableEnum64AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+
+            var nullableEnum64AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum64AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum64AsStringCollectionElementType = nullableEnum64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+
+            var nullableEnum64Collection = runtimeEntityType.AddProperty(
+                "NullableEnum64Collection",
+                typeof(List<CompiledModelTestBase.Enum64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum64CollectionElementType = nullableEnum64Collection.SetElementType(typeof(CompiledModelTestBase.Enum64?),
+                nullable: true);
+
+            var nullableEnum8 = runtimeEntityType.AddProperty(
+                "NullableEnum8",
+                typeof(CompiledModelTestBase.Enum8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnum8Array = runtimeEntityType.AddProperty(
+                "NullableEnum8Array",
+                typeof(CompiledModelTestBase.Enum8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum8ArrayElementType = nullableEnum8Array.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+
+            var nullableEnum8AsString = runtimeEntityType.AddProperty(
+                "NullableEnum8AsString",
+                typeof(CompiledModelTestBase.Enum8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnum8AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum8AsStringArray",
+                typeof(CompiledModelTestBase.Enum8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum8AsStringArrayElementType = nullableEnum8AsStringArray.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+
+            var nullableEnum8AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum8AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum8AsStringCollectionElementType = nullableEnum8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+
+            var nullableEnum8Collection = runtimeEntityType.AddProperty(
+                "NullableEnum8Collection",
+                typeof(List<CompiledModelTestBase.Enum8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnum8CollectionElementType = nullableEnum8Collection.SetElementType(typeof(CompiledModelTestBase.Enum8?),
+                nullable: true);
+
+            var nullableEnumU16 = runtimeEntityType.AddProperty(
+                "NullableEnumU16",
+                typeof(CompiledModelTestBase.EnumU16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnumU16Array = runtimeEntityType.AddProperty(
+                "NullableEnumU16Array",
+                typeof(CompiledModelTestBase.EnumU16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU16ArrayElementType = nullableEnumU16Array.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+
+            var nullableEnumU16AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsString",
+                typeof(CompiledModelTestBase.EnumU16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnumU16AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsStringArray",
+                typeof(CompiledModelTestBase.EnumU16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU16AsStringArrayElementType = nullableEnumU16AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+
+            var nullableEnumU16AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU16AsStringCollectionElementType = nullableEnumU16AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+
+            var nullableEnumU16Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU16Collection",
+                typeof(List<CompiledModelTestBase.EnumU16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU16CollectionElementType = nullableEnumU16Collection.SetElementType(typeof(CompiledModelTestBase.EnumU16?),
+                nullable: true);
+
+            var nullableEnumU32 = runtimeEntityType.AddProperty(
+                "NullableEnumU32",
+                typeof(CompiledModelTestBase.EnumU32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnumU32Array = runtimeEntityType.AddProperty(
+                "NullableEnumU32Array",
+                typeof(CompiledModelTestBase.EnumU32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU32ArrayElementType = nullableEnumU32Array.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+
+            var nullableEnumU32AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsString",
+                typeof(CompiledModelTestBase.EnumU32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnumU32AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsStringArray",
+                typeof(CompiledModelTestBase.EnumU32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU32AsStringArrayElementType = nullableEnumU32AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+
+            var nullableEnumU32AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU32AsStringCollectionElementType = nullableEnumU32AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+
+            var nullableEnumU32Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU32Collection",
+                typeof(List<CompiledModelTestBase.EnumU32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU32CollectionElementType = nullableEnumU32Collection.SetElementType(typeof(CompiledModelTestBase.EnumU32?),
+                nullable: true);
+
+            var nullableEnumU64 = runtimeEntityType.AddProperty(
+                "NullableEnumU64",
+                typeof(CompiledModelTestBase.EnumU64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnumU64Array = runtimeEntityType.AddProperty(
+                "NullableEnumU64Array",
+                typeof(CompiledModelTestBase.EnumU64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU64ArrayElementType = nullableEnumU64Array.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+
+            var nullableEnumU64AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsString",
+                typeof(CompiledModelTestBase.EnumU64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnumU64AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsStringArray",
+                typeof(CompiledModelTestBase.EnumU64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU64AsStringArrayElementType = nullableEnumU64AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+
+            var nullableEnumU64AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU64AsStringCollectionElementType = nullableEnumU64AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+
+            var nullableEnumU64Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU64Collection",
+                typeof(List<CompiledModelTestBase.EnumU64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU64CollectionElementType = nullableEnumU64Collection.SetElementType(typeof(CompiledModelTestBase.EnumU64?),
+                nullable: true);
+
+            var nullableEnumU8 = runtimeEntityType.AddProperty(
+                "NullableEnumU8",
+                typeof(CompiledModelTestBase.EnumU8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnumU8Array = runtimeEntityType.AddProperty(
+                "NullableEnumU8Array",
+                typeof(CompiledModelTestBase.EnumU8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU8ArrayElementType = nullableEnumU8Array.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+
+            var nullableEnumU8AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsString",
+                typeof(CompiledModelTestBase.EnumU8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableEnumU8AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsStringArray",
+                typeof(CompiledModelTestBase.EnumU8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU8AsStringArrayElementType = nullableEnumU8AsStringArray.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+
+            var nullableEnumU8AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU8AsStringCollectionElementType = nullableEnumU8AsStringCollection.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+
+            var nullableEnumU8Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU8Collection",
+                typeof(List<CompiledModelTestBase.EnumU8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableEnumU8CollectionElementType = nullableEnumU8Collection.SetElementType(typeof(CompiledModelTestBase.EnumU8?),
+                nullable: true);
+
+            var nullableFloat = runtimeEntityType.AddProperty(
+                "NullableFloat",
+                typeof(float?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableFloat", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableFloat>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableFloatArray = runtimeEntityType.AddProperty(
+                "NullableFloatArray",
+                typeof(float?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableFloatArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableFloatArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableFloatArrayElementType = nullableFloatArray.SetElementType(typeof(float?),
+                nullable: true);
+
+            var nullableGuid = runtimeEntityType.AddProperty(
+                "NullableGuid",
+                typeof(Guid?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableGuid", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableGuid>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableGuidArray = runtimeEntityType.AddProperty(
+                "NullableGuidArray",
+                typeof(Guid?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableGuidArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableGuidArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableGuidArrayElementType = nullableGuidArray.SetElementType(typeof(Guid?),
+                nullable: true);
+
+            var nullableIPAddress = runtimeEntityType.AddProperty(
+                "NullableIPAddress",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableIPAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableIPAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableIPAddressArray = runtimeEntityType.AddProperty(
+                "NullableIPAddressArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableIPAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableIPAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableIPAddressArrayElementType = nullableIPAddressArray.SetElementType(typeof(IPAddress),
+                nullable: true);
+
+            var nullableInt16 = runtimeEntityType.AddProperty(
+                "NullableInt16",
+                typeof(short?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableInt16Array = runtimeEntityType.AddProperty(
+                "NullableInt16Array",
+                typeof(short?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableInt16ArrayElementType = nullableInt16Array.SetElementType(typeof(short?),
+                nullable: true);
+
+            var nullableInt32 = runtimeEntityType.AddProperty(
+                "NullableInt32",
+                typeof(int?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableInt32Array = runtimeEntityType.AddProperty(
+                "NullableInt32Array",
+                typeof(int?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableInt32ArrayElementType = nullableInt32Array.SetElementType(typeof(int?),
+                nullable: true);
+
+            var nullableInt64 = runtimeEntityType.AddProperty(
+                "NullableInt64",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableInt64Array = runtimeEntityType.AddProperty(
+                "NullableInt64Array",
+                typeof(long?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableInt64ArrayElementType = nullableInt64Array.SetElementType(typeof(long?),
+                nullable: true);
+
+            var nullableInt8 = runtimeEntityType.AddProperty(
+                "NullableInt8",
+                typeof(sbyte?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableInt8Array = runtimeEntityType.AddProperty(
+                "NullableInt8Array",
+                typeof(sbyte?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableInt8ArrayElementType = nullableInt8Array.SetElementType(typeof(sbyte?),
+                nullable: true);
+
+            var nullablePhysicalAddress = runtimeEntityType.AddProperty(
+                "NullablePhysicalAddress",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullablePhysicalAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullablePhysicalAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullablePhysicalAddressArray = runtimeEntityType.AddProperty(
+                "NullablePhysicalAddressArray",
+                typeof(PhysicalAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullablePhysicalAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullablePhysicalAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullablePhysicalAddressArrayElementType = nullablePhysicalAddressArray.SetElementType(typeof(PhysicalAddress),
+                nullable: true);
+
+            var nullableString = runtimeEntityType.AddProperty(
+                "NullableString",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableStringArray = runtimeEntityType.AddProperty(
+                "NullableStringArray",
+                typeof(string[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableStringArrayElementType = nullableStringArray.SetElementType(typeof(string),
+                nullable: true);
+
+            var nullableTimeOnly = runtimeEntityType.AddProperty(
+                "NullableTimeOnly",
+                typeof(TimeOnly?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableTimeOnlyArray = runtimeEntityType.AddProperty(
+                "NullableTimeOnlyArray",
+                typeof(TimeOnly?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableTimeOnlyArrayElementType = nullableTimeOnlyArray.SetElementType(typeof(TimeOnly?),
+                nullable: true);
+
+            var nullableTimeSpan = runtimeEntityType.AddProperty(
+                "NullableTimeSpan",
+                typeof(TimeSpan?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeSpan", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeSpan>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableTimeSpanArray = runtimeEntityType.AddProperty(
+                "NullableTimeSpanArray",
+                typeof(TimeSpan?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeSpanArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeSpanArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableTimeSpanArrayElementType = nullableTimeSpanArray.SetElementType(typeof(TimeSpan?),
+                nullable: true);
+
+            var nullableUInt16 = runtimeEntityType.AddProperty(
+                "NullableUInt16",
+                typeof(ushort?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableUInt16Array = runtimeEntityType.AddProperty(
+                "NullableUInt16Array",
+                typeof(ushort?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableUInt16ArrayElementType = nullableUInt16Array.SetElementType(typeof(ushort?),
+                nullable: true);
+
+            var nullableUInt32 = runtimeEntityType.AddProperty(
+                "NullableUInt32",
+                typeof(uint?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableUInt32Array = runtimeEntityType.AddProperty(
+                "NullableUInt32Array",
+                typeof(uint?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableUInt32ArrayElementType = nullableUInt32Array.SetElementType(typeof(uint?),
+                nullable: true);
+
+            var nullableUInt64 = runtimeEntityType.AddProperty(
+                "NullableUInt64",
+                typeof(ulong?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableUInt64Array = runtimeEntityType.AddProperty(
+                "NullableUInt64Array",
+                typeof(ulong?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableUInt64ArrayElementType = nullableUInt64Array.SetElementType(typeof(ulong?),
+                nullable: true);
+
+            var nullableUInt8 = runtimeEntityType.AddProperty(
+                "NullableUInt8",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableUInt8Array = runtimeEntityType.AddProperty(
+                "NullableUInt8Array",
+                typeof(byte?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableUInt8ArrayElementType = nullableUInt8Array.SetElementType(typeof(byte?),
+                nullable: true);
+
+            var nullableUri = runtimeEntityType.AddProperty(
+                "NullableUri",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUri", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUri>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var nullableUriArray = runtimeEntityType.AddProperty(
+                "NullableUriArray",
+                typeof(Uri[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUriArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUriArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var nullableUriArrayElementType = nullableUriArray.SetElementType(typeof(Uri),
+                nullable: true);
+
+            var physicalAddress = runtimeEntityType.AddProperty(
+                "PhysicalAddress",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var physicalAddressArray = runtimeEntityType.AddProperty(
+                "PhysicalAddressArray",
+                typeof(PhysicalAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var physicalAddressArrayElementType = physicalAddressArray.SetElementType(typeof(PhysicalAddress));
+
+            var physicalAddressToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "PhysicalAddressToBytesConverterProperty",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new PhysicalAddressToBytesConverter());
+
+            var physicalAddressToStringConverterProperty = runtimeEntityType.AddProperty(
+                "PhysicalAddressToStringConverterProperty",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new PhysicalAddressToStringConverter());
+
+            var @string = runtimeEntityType.AddProperty(
+                "String",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("String", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<String>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var stringArray = runtimeEntityType.AddProperty(
+                "StringArray",
+                typeof(string[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var stringArrayElementType = stringArray.SetElementType(typeof(string));
+
+            var stringReadOnlyCollection = runtimeEntityType.AddProperty(
+                "StringReadOnlyCollection",
+                typeof(IReadOnlyCollection<string>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_stringReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var stringReadOnlyCollectionElementType = stringReadOnlyCollection.SetElementType(typeof(string));
+
+            var stringToBoolConverterProperty = runtimeEntityType.AddProperty(
+                "StringToBoolConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToBoolConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToBoolConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToBoolConverter());
+
+            var stringToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "StringToBytesConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            stringToBytesConverterProperty.SetValueConverter(new ValueConverter<string, byte[]>(
+                byte[] (string v) => Encoding.GetEncoding(12000).GetBytes(v),
+                string (byte[] v) => Encoding.GetEncoding(12000).GetString(v)));
+
+            var stringToCharConverterProperty = runtimeEntityType.AddProperty(
+                "StringToCharConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToCharConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToCharConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToCharConverter());
+
+            var stringToDateOnlyConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateOnlyConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateOnlyConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateOnlyConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateOnlyConverter());
+
+            var stringToDateTimeConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateTimeConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateTimeConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateTimeConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateTimeConverter());
+
+            var stringToDateTimeOffsetConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateTimeOffsetConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateTimeOffsetConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateTimeOffsetConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateTimeOffsetConverter());
+
+            var stringToDecimalNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDecimalNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDecimalNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDecimalNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<decimal>());
+
+            var stringToDoubleNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDoubleNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDoubleNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDoubleNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<double>());
+
+            var stringToEnumConverterProperty = runtimeEntityType.AddProperty(
+                "StringToEnumConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToEnumConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToEnumConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToEnumConverter<CompiledModelTestBase.EnumU32>());
+
+            var stringToGuidConverterProperty = runtimeEntityType.AddProperty(
+                "StringToGuidConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToGuidConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToGuidConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var stringToIntNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToIntNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToIntNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToIntNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<int>());
+
+            var stringToTimeOnlyConverterProperty = runtimeEntityType.AddProperty(
+                "StringToTimeOnlyConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToTimeOnlyConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToTimeOnlyConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToTimeOnlyConverter());
+
+            var stringToTimeSpanConverterProperty = runtimeEntityType.AddProperty(
+                "StringToTimeSpanConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToTimeSpanConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToTimeSpanConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToTimeSpanConverter());
+
+            var stringToUriConverterProperty = runtimeEntityType.AddProperty(
+                "StringToUriConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToUriConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToUriConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToUriConverter());
+
+            var timeOnly = runtimeEntityType.AddProperty(
+                "TimeOnly",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new TimeOnly(0, 0, 0));
+
+            var timeOnlyArray = runtimeEntityType.AddProperty(
+                "TimeOnlyArray",
+                typeof(TimeOnly[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var timeOnlyArrayElementType = timeOnlyArray.SetElementType(typeof(TimeOnly));
+
+            var timeOnlyToStringConverterProperty = runtimeEntityType.AddProperty(
+                "TimeOnlyToStringConverterProperty",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeOnlyToStringConverter());
+            timeOnlyToStringConverterProperty.SetSentinelFromProviderValue("00:00:00");
+
+            var timeOnlyToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "TimeOnlyToTicksConverterProperty",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeOnlyToTicksConverter());
+            timeOnlyToTicksConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var timeSpan = runtimeEntityType.AddProperty(
+                "TimeSpan",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpan", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpan>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new TimeSpan(0, 0, 0, 0, 0));
+
+            var timeSpanArray = runtimeEntityType.AddProperty(
+                "TimeSpanArray",
+                typeof(TimeSpan[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var timeSpanArrayElementType = timeSpanArray.SetElementType(typeof(TimeSpan));
+
+            var timeSpanToStringConverterProperty = runtimeEntityType.AddProperty(
+                "TimeSpanToStringConverterProperty",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeSpanToStringConverter());
+            timeSpanToStringConverterProperty.SetSentinelFromProviderValue("00:00:00");
+
+            var timeSpanToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "TimeSpanToTicksConverterProperty",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeSpanToTicksConverter());
+            timeSpanToTicksConverterProperty.SetSentinelFromProviderValue(0L);
+
+            var uInt16 = runtimeEntityType.AddProperty(
+                "UInt16",
+                typeof(ushort),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt16.SetSentinelFromProviderValue(0);
+
+            var uInt16Array = runtimeEntityType.AddProperty(
+                "UInt16Array",
+                typeof(ushort[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var uInt16ArrayElementType = uInt16Array.SetElementType(typeof(ushort));
+
+            var uInt32 = runtimeEntityType.AddProperty(
+                "UInt32",
+                typeof(uint),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt32.SetSentinelFromProviderValue(0L);
+
+            var uInt32Array = runtimeEntityType.AddProperty(
+                "UInt32Array",
+                typeof(uint[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var uInt32ArrayElementType = uInt32Array.SetElementType(typeof(uint));
+
+            var uInt64 = runtimeEntityType.AddProperty(
+                "UInt64",
+                typeof(ulong),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt64.SetSentinelFromProviderValue(0m);
+
+            var uInt64Array = runtimeEntityType.AddProperty(
+                "UInt64Array",
+                typeof(ulong[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var uInt64ArrayElementType = uInt64Array.SetElementType(typeof(ulong));
+
+            var uInt8 = runtimeEntityType.AddProperty(
+                "UInt8",
+                typeof(byte),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (byte)0);
+
+            var uInt8Array = runtimeEntityType.AddProperty(
+                "UInt8Array",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var uInt8ReadOnlyCollection = runtimeEntityType.AddProperty(
+                "UInt8ReadOnlyCollection",
+                typeof(IReadOnlyCollection<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8ReadOnlyCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("_uInt8ReadOnlyCollection", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var uInt8ReadOnlyCollectionElementType = uInt8ReadOnlyCollection.SetElementType(typeof(byte));
+
+            var uri = runtimeEntityType.AddProperty(
+                "Uri",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Uri", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Uri>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var uriArray = runtimeEntityType.AddProperty(
+                "UriArray",
+                typeof(Uri[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UriArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UriArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            var uriArrayElementType = uriArray.SetElementType(typeof(Uri));
+
+            var uriToStringConverterProperty = runtimeEntityType.AddProperty(
+                "UriToStringConverterProperty",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UriToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UriToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new UriToStringConverter());
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "ManyTypes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/OwnedType0EntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/OwnedType0EntityType.cs
new file mode 100644
index 00000000..32cbfcb9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/OwnedType0EntityType.cs
@@ -0,0 +1,176 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class OwnedType0EntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType",
+                typeof(CompiledModelTestBase.OwnedType),
+                baseEntityType,
+                sharedClrType: true,
+                propertyCount: 13,
+                servicePropertyCount: 1,
+                foreignKeyCount: 1,
+                keyCount: 1);
+
+            var principalDerivedId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedId",
+                typeof(long),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+            principalDerivedId.SetSentinelFromProviderValue(0);
+
+            var principalDerivedAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedAlternateId",
+                typeof(Guid),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var details = runtimeEntityType.AddProperty(
+                "Details",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var number = runtimeEntityType.AddProperty(
+                "Number",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0);
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+
+            var context = runtimeEntityType.AddServiceProperty(
+                "Context",
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Context", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                serviceType: typeof(DbContext));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalDerivedId, principalDerivedAlternateId, id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalDerivedId"), declaringEntityType.FindProperty("PrincipalDerivedAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true,
+                ownership: true);
+
+            var manyOwned = principalEntityType.AddNavigation("ManyOwned",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(IList<CompiledModelTestBase.OwnedType>),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("ManyOwned", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "ManyOwned");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/OwnedTypeEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/OwnedTypeEntityType.cs
new file mode 100644
index 00000000..b34444d8
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/OwnedTypeEntityType.cs
@@ -0,0 +1,230 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class OwnedTypeEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                typeof(CompiledModelTestBase.OwnedType),
+                baseEntityType,
+                sharedClrType: true,
+                changeTrackingStrategy: ChangeTrackingStrategy.ChangingAndChangedNotificationsWithOriginalValues,
+                propertyCount: 12,
+                servicePropertyCount: 1,
+                foreignKeyCount: 2,
+                keyCount: 1);
+
+            var principalBaseId = runtimeEntityType.AddProperty(
+                "PrincipalBaseId",
+                typeof(long),
+                propertyAccessMode: PropertyAccessMode.Field,
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+            principalBaseId.SetSentinelFromProviderValue(0);
+
+            var overrides = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var principalBaseIdPrincipalBase = new RuntimeRelationalPropertyOverrides(
+                principalBaseId,
+                StoreObjectIdentifier.Table("PrincipalBase", "mySchema"),
+                false,
+                null);
+            principalBaseIdPrincipalBase.AddAnnotation("Jet:IdentityIncrement", 3);
+            principalBaseIdPrincipalBase.AddAnnotation("Jet:IdentitySeed", 2);
+            principalBaseIdPrincipalBase.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            overrides.Add(StoreObjectIdentifier.Table("PrincipalBase", "mySchema"), principalBaseIdPrincipalBase);
+            principalBaseId.AddAnnotation("Relational:RelationalOverrides", overrides);
+
+            principalBaseId.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var principalBaseAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalBaseAlternateId",
+                typeof(Guid),
+                propertyAccessMode: PropertyAccessMode.Field,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+
+            var details = runtimeEntityType.AddProperty(
+                "Details",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+
+            var overrides0 = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var detailsDetails = new RuntimeRelationalPropertyOverrides(
+                details,
+                StoreObjectIdentifier.Table("Details", null),
+                false,
+                null);
+            overrides0.Add(StoreObjectIdentifier.Table("Details", null), detailsDetails);
+            details.AddAnnotation("Relational:RelationalOverrides", overrides0);
+
+
+            var number = runtimeEntityType.AddProperty(
+                "Number",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                sentinel: 0);
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+
+            var context = runtimeEntityType.AddServiceProperty(
+                "Context",
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Context", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                serviceType: typeof(DbContext));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalBaseId, principalBaseAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId"), declaringEntityType.FindProperty("PrincipalBaseAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                requiredDependent: true,
+                ownership: true);
+
+            var owned = principalEntityType.AddNavigation("Owned",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.OwnedType),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Owned", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("_ownedField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId"), declaringEntityType.FindProperty("PrincipalBaseAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("PrincipalBaseId"), principalEntityType.FindProperty("PrincipalBaseAlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                requiredDependent: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var fragments = new StoreObjectDictionary<RuntimeEntityTypeMappingFragment>();
+            var detailsFragment = new RuntimeEntityTypeMappingFragment(
+                runtimeEntityType,
+                StoreObjectIdentifier.Table("Details", null),
+                null);
+            fragments.Add(StoreObjectIdentifier.Table("Details", null), detailsFragment);
+            runtimeEntityType.AddAnnotation("Relational:MappingFragments", fragments);
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", "mySchema");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/PrincipalBaseEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/PrincipalBaseEntityType.cs
new file mode 100644
index 00000000..1c28cafd
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/PrincipalBaseEntityType.cs
@@ -0,0 +1,213 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                typeof(CompiledModelTestBase.PrincipalBase),
+                baseEntityType,
+                discriminatorValue: "PrincipalBase",
+                derivedTypesCount: 1,
+                propertyCount: 14,
+                navigationCount: 1,
+                skipNavigationCount: 1,
+                unnamedIndexCount: 1,
+                keyCount: 2);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+
+            var overrides = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var idPrincipalDerived = new RuntimeRelationalPropertyOverrides(
+                id,
+                StoreObjectIdentifier.Table("PrincipalDerived", null),
+                true,
+                "DerivedId");
+            overrides.Add(StoreObjectIdentifier.Table("PrincipalDerived", null), idPrincipalDerived);
+            id.AddAnnotation("Relational:RelationalOverrides", overrides);
+
+            id.AddAnnotation("Jet:IdentityIncrement", 3);
+            id.AddAnnotation("Jet:IdentitySeed", 2);
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var alternateId = runtimeEntityType.AddProperty(
+                "AlternateId",
+                typeof(Guid),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("AlternateId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.FieldDuringConstruction,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"),
+                jsonValueReaderWriter: JsonGuidReaderWriter.Instance);
+
+            var enum1 = runtimeEntityType.AddProperty(
+                "Enum1",
+                typeof(CompiledModelTestBase.AnEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum1.SetSentinelFromProviderValue(0);
+
+            var enum2 = runtimeEntityType.AddProperty(
+                "Enum2",
+                typeof(CompiledModelTestBase.AnEnum?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var flagsEnum1 = runtimeEntityType.AddProperty(
+                "FlagsEnum1",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum1.SetSentinelFromProviderValue(0);
+
+            var flagsEnum2 = runtimeEntityType.AddProperty(
+                "FlagsEnum2",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Property);
+            flagsEnum2.SetSentinelFromProviderValue(6);
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { id, alternateId });
+            runtimeEntityType.SetPrimaryKey(key0);
+            key0.AddAnnotation("Relational:Name", "PK");
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { alternateId, id });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeSkipNavigation CreateSkipNavigation1(RuntimeEntityType declaringEntityType, RuntimeEntityType targetEntityType, RuntimeEntityType joinEntityType)
+        {
+            var skipNavigation = declaringEntityType.AddSkipNavigation(
+                "Deriveds",
+                targetEntityType,
+                joinEntityType.FindForeignKey(
+                    new[] { joinEntityType.FindProperty("PrincipalsId"), joinEntityType.FindProperty("PrincipalsAlternateId") },
+                    declaringEntityType.FindKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") }),
+                    declaringEntityType),
+                true,
+                false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Deriveds", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Deriveds>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var inverse = targetEntityType.FindSkipNavigation("Principals");
+            if (inverse != null)
+            {
+                skipNavigation.Inverse = inverse;
+                inverse.Inverse = skipNavigation;
+            }
+
+            return skipNavigation;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPT");
+            runtimeEntityType.AddAnnotation("Relational:Schema", "mySchema");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs
new file mode 100644
index 00000000..011b8800
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalBasePrincipalDerivedDependentBasebyteEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                typeof(Dictionary<string, object>),
+                baseEntityType,
+                sharedClrType: true,
+                indexerPropertyInfo: RuntimeEntityType.FindIndexerProperty(typeof(Dictionary<string, object>)),
+                propertyBag: true,
+                propertyCount: 5,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var derivedsId = runtimeEntityType.AddProperty(
+                "DerivedsId",
+                typeof(long),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+
+            var derivedsAlternateId = runtimeEntityType.AddProperty(
+                "DerivedsAlternateId",
+                typeof(Guid),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var principalsId = runtimeEntityType.AddProperty(
+                "PrincipalsId",
+                typeof(long),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                providerPropertyType: typeof(int));
+
+            var principalsAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalsAlternateId",
+                typeof(Guid),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var rowid = runtimeEntityType.AddProperty(
+                "rowid",
+                typeof(byte[]),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                nullable: true,
+                concurrencyToken: true,
+                valueGenerated: ValueGenerated.OnAddOrUpdate,
+                beforeSaveBehavior: PropertySaveBehavior.Ignore,
+                afterSaveBehavior: PropertySaveBehavior.Ignore);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { derivedsId, derivedsAlternateId, principalsId, principalsAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalsId, principalsAlternateId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DerivedsId"), declaringEntityType.FindProperty("DerivedsAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalsId"), declaringEntityType.FindProperty("PrincipalsAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.ClientCascade,
+                required: true);
+
+            runtimeForeignKey.AddAnnotation("Relational:Name", "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Princip~1");
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBasePrincipalDerived<DependentBase<byte?>>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/PrincipalDerivedEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/PrincipalDerivedEntityType.cs
new file mode 100644
index 00000000..757c5ab1
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/No_NativeAOT/PrincipalDerivedEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                baseEntityType,
+                discriminatorValue: "PrincipalDerived<DependentBase<byte?>>",
+                propertyCount: 0,
+                navigationCount: 2,
+                skipNavigationCount: 1,
+                foreignKeyCount: 1);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeSkipNavigation CreateSkipNavigation1(RuntimeEntityType declaringEntityType, RuntimeEntityType targetEntityType, RuntimeEntityType joinEntityType)
+        {
+            var skipNavigation = declaringEntityType.AddSkipNavigation(
+                "Principals",
+                targetEntityType,
+                joinEntityType.FindForeignKey(
+                    new[] { joinEntityType.FindProperty("DerivedsId"), joinEntityType.FindProperty("DerivedsAlternateId") },
+                    declaringEntityType.FindKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") }),
+                    declaringEntityType),
+                true,
+                false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Principals", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Principals>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var inverse = targetEntityType.FindSkipNavigation("Deriveds");
+            if (inverse != null)
+            {
+                skipNavigation.Inverse = inverse;
+                inverse.Inverse = skipNavigation;
+            }
+
+            return skipNavigation;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalDerived");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModelBuilder.cs
new file mode 100644
index 00000000..a0e11d88
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModelBuilder.cs
@@ -0,0 +1,49 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: true, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 0)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var sequences = new Dictionary<(string, string), ISequence>();
+            var @long = new RuntimeSequence(
+                "Long",
+                this,
+                typeof(long),
+                startValue: -4L,
+                incrementBy: 2,
+                cyclic: true,
+                minValue: -2L,
+                maxValue: 2L);
+
+            sequences[("Long", null)] = @long;
+
+            AddAnnotation("Relational:Sequences", sequences);
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DbContextModelBuilder.cs
new file mode 100644
index 00000000..c00ccf15
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DbContextModelBuilder.cs
@@ -0,0 +1,87 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Update.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 1)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var dependentDerived = DependentDerivedEntityType.Create(this);
+
+            DependentDerivedEntityType.CreateAnnotations(dependentDerived);
+
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var dependentDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<int>")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            dependentDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<int>", null, relationalModel);
+            var dataColumnBase = new ColumnBase<ColumnMappingBase>("Data", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintTableBase.Columns.Add("Data", dataColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintTableBase.Columns.Add("Id", idColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<int>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintMappingBase = new TableMappingBase<ColumnMappingBase>(dependentDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, dependentDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dataColumnBase, dependentDerived.FindProperty("Data")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentDerivedintMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            dependentDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dependentDerivedintTable = new Table("DependentDerived<int>", null, relationalModel);
+            var idColumn = new Column("Id", "integer", dependentDerivedintTable);
+            dependentDerivedintTable.Columns.Add("Id", idColumn);
+            idColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(idColumn);
+            var dataColumn = new Column("Data", "varchar(255)", dependentDerivedintTable)
+            {
+                IsNullable = true
+            };
+            dependentDerivedintTable.Columns.Add("Data", dataColumn);
+            dataColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(dataColumn);
+            relationalModel.Tables.Add(("DependentDerived<int>", null), dependentDerivedintTable);
+            var dependentDerivedintTableMapping = new TableMapping(dependentDerived, dependentDerivedintTable, null);
+            dependentDerivedintTable.AddTypeMapping(dependentDerivedintTableMapping, false);
+            tableMappings.Add(dependentDerivedintTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, dependentDerived.FindProperty("Id")!, dependentDerivedintTableMapping);
+            RelationalModel.CreateColumnMapping(dataColumn, dependentDerived.FindProperty("Data")!, dependentDerivedintTableMapping);
+            var pK_DependentDerivedint = new UniqueConstraint("PK_DependentDerived<int>", dependentDerivedintTable, new[] { idColumn });
+            dependentDerivedintTable.PrimaryKey = pK_DependentDerivedint;
+            pK_DependentDerivedint.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<int>(pK_DependentDerivedint));
+            var pK_DependentDerivedintKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<int>",
+                new[] { "Id" });
+            pK_DependentDerivedint.MappedKeys.Add(pK_DependentDerivedintKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DependentDerivedintKey).Add(pK_DependentDerivedint);
+            dependentDerivedintTable.UniqueConstraints.Add("PK_DependentDerived<int>", pK_DependentDerivedint);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DependentBaseUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DependentBaseUnsafeAccessors.cs
new file mode 100644
index 00000000..ae6e1779
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DependentBaseUnsafeAccessors.cs
@@ -0,0 +1,15 @@
+// <auto-generated />
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DependentBaseUnsafeAccessors<TKey>
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref TKey Id(CompiledModelTestBase.DependentBase<TKey> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DependentDerivedEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DependentDerivedEntityType.cs
new file mode 100644
index 00000000..b743cb00
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DependentDerivedEntityType.cs
@@ -0,0 +1,183 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DependentDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<int>",
+                typeof(CompiledModelTestBase.DependentDerived<int>),
+                baseEntityType,
+                propertyCount: 2,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.AbstractBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<int>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.SetGetter(
+                int (CompiledModelTestBase.DependentDerived<int> instance) => DependentBaseUnsafeAccessors<int>.Id(instance),
+                bool (CompiledModelTestBase.DependentDerived<int> instance) => DependentBaseUnsafeAccessors<int>.Id(instance) == 0);
+            id.SetSetter(
+                CompiledModelTestBase.DependentDerived<int> (CompiledModelTestBase.DependentDerived<int> instance, int value) =>
+                {
+                    DependentBaseUnsafeAccessors<int>.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.DependentDerived<int> (CompiledModelTestBase.DependentDerived<int> instance, int value) =>
+                {
+                    DependentBaseUnsafeAccessors<int>.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                int (IInternalEntry entry) => DependentBaseUnsafeAccessors<int>.Id(((CompiledModelTestBase.DependentDerived<int>)(entry.Entity))),
+                int (IInternalEntry entry) => DependentBaseUnsafeAccessors<int>.Id(((CompiledModelTestBase.DependentDerived<int>)(entry.Entity))),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(id, 0),
+                int (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<int>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: -1);
+            id.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<int>(id));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.DependentDerived<int>).GetProperty("Data", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentDerived<int>).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            data.SetGetter(
+                string (CompiledModelTestBase.DependentDerived<int> instance) => DependentDerivedUnsafeAccessors<int>.Data(instance),
+                bool (CompiledModelTestBase.DependentDerived<int> instance) => DependentDerivedUnsafeAccessors<int>.Data(instance) == null);
+            data.SetSetter(
+                CompiledModelTestBase.DependentDerived<int> (CompiledModelTestBase.DependentDerived<int> instance, string value) =>
+                {
+                    DependentDerivedUnsafeAccessors<int>.Data(instance) = value;
+                    return instance;
+                });
+            data.SetMaterializationSetter(
+                CompiledModelTestBase.DependentDerived<int> (CompiledModelTestBase.DependentDerived<int> instance, string value) =>
+                {
+                    DependentDerivedUnsafeAccessors<int>.Data(instance) = value;
+                    return instance;
+                });
+            data.SetAccessors(
+                string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<int>.Data(((CompiledModelTestBase.DependentDerived<int>)(entry.Entity))),
+                string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<int>.Data(((CompiledModelTestBase.DependentDerived<int>)(entry.Entity))),
+                string (IInternalEntry entry) => entry.ReadOriginalValue<string>(data, 1),
+                string (IInternalEntry entry) => entry.GetCurrentValue<string>(data));
+            data.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            data.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var data = runtimeEntityType.FindProperty("Data");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNonNullableFactory<int>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<int>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.DependentDerived<int>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<int, string>(((ValueComparer<int>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(id)), (source.GetCurrentValue<string>(data) == null ? null : ((ValueComparer<string>)(((IProperty)data).GetValueComparer())).Snapshot(source.GetCurrentValue<string>(data))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => Snapshot.Empty);
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => Snapshot.Empty);
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => Snapshot.Empty);
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.DependentDerived<int>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<int>(((ValueComparer<int>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<int>(id)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 2,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 2,
+                shadowCount: 0,
+                relationshipCount: 1,
+                storeGeneratedCount: 0));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentDerived<int>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DependentDerivedUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DependentDerivedUnsafeAccessors.cs
new file mode 100644
index 00000000..8847446b
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/SimpleModel/DependentDerivedUnsafeAccessors.cs
@@ -0,0 +1,16 @@
+// <auto-generated />
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DependentDerivedUnsafeAccessors<TKey>
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Data>k__BackingField")]
+        public static extern ref string Data(CompiledModelTestBase.DependentDerived<TKey> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DbContextModelBuilder.cs
new file mode 100644
index 00000000..26e83a66
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DbContextModelBuilder.cs
@@ -0,0 +1,1124 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Update.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 3)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var dependentBase = DependentBaseEntityType.Create(this);
+            var principalBase = PrincipalBaseEntityType.Create(this);
+            var principalDerived = PrincipalDerivedEntityType.Create(this, principalBase);
+
+            DependentBaseEntityType.CreateForeignKey1(dependentBase, principalDerived);
+            PrincipalBaseEntityType.CreateForeignKey1(principalBase, principalBase);
+            PrincipalBaseEntityType.CreateForeignKey2(principalBase, principalDerived);
+
+            DependentBaseEntityType.CreateAnnotations(dependentBase);
+            PrincipalBaseEntityType.CreateAnnotations(principalBase);
+            PrincipalDerivedEntityType.CreateAnnotations(principalDerived);
+
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:DefaultSchema", "TPC");
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var dependentBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            dependentBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", null, relationalModel);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "byte", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Id", idColumnBase);
+            var principalIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalId", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalId", principalIdColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(dependentBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, dependentBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalIdColumnBase, dependentBase.FindProperty("PrincipalId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            dependentBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dependentBasebyteTable = new Table("DependentBase<byte?>", "TPC", relationalModel);
+            var idColumn = new Column("Id", "byte", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("Id", idColumn);
+            idColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte>(idColumn);
+            var principalIdColumn = new Column("PrincipalId", "decimal(20,0)", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("PrincipalId", principalIdColumn);
+            principalIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(principalIdColumn);
+            relationalModel.Tables.Add(("DependentBase<byte?>", "TPC"), dependentBasebyteTable);
+            var dependentBasebyteTableMapping = new TableMapping(dependentBase, dependentBasebyteTable, null);
+            dependentBasebyteTable.AddTypeMapping(dependentBasebyteTableMapping, false);
+            tableMappings.Add(dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, dependentBase.FindProperty("Id")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalIdColumn, dependentBase.FindProperty("PrincipalId")!, dependentBasebyteTableMapping);
+            var pK_DependentBasebyte = new UniqueConstraint("PK_DependentBase<byte?>", dependentBasebyteTable, new[] { idColumn });
+            dependentBasebyteTable.PrimaryKey = pK_DependentBasebyte;
+            pK_DependentBasebyte.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<byte>(pK_DependentBasebyte));
+            var pK_DependentBasebyteKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "Id" });
+            pK_DependentBasebyte.MappedKeys.Add(pK_DependentBasebyteKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DependentBasebyteKey).Add(pK_DependentBasebyte);
+            dependentBasebyteTable.UniqueConstraints.Add("PK_DependentBase<byte?>", pK_DependentBasebyte);
+            var iX_DependentBasebyte_PrincipalId = new TableIndex(
+            "IX_DependentBase<byte?>_PrincipalId", dependentBasebyteTable, new[] { principalIdColumn }, true);
+            iX_DependentBasebyte_PrincipalId.SetRowIndexValueFactory(new SimpleRowIndexValueFactory<long>(iX_DependentBasebyte_PrincipalId));
+            var iX_DependentBasebyte_PrincipalIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" });
+            iX_DependentBasebyte_PrincipalId.MappedIndexes.Add(iX_DependentBasebyte_PrincipalIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_DependentBasebyte_PrincipalIdIx).Add(iX_DependentBasebyte_PrincipalId);
+            dependentBasebyteTable.Indexes.Add("IX_DependentBase<byte?>_PrincipalId", iX_DependentBasebyte_PrincipalId);
+
+            var principalBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase")!;
+
+            var defaultTableMappings0 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", null, relationalModel);
+            var enum1ColumnBase = new ColumnBase<ColumnMappingBase>("Enum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum1", enum1ColumnBase);
+            var enum2ColumnBase = new ColumnBase<ColumnMappingBase>("Enum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum2", enum2ColumnBase);
+            var flagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum1", flagsEnum1ColumnBase);
+            var flagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum2", flagsEnum2ColumnBase);
+            var idColumnBase0 = new ColumnBase<ColumnMappingBase>("Id", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Id", idColumnBase0);
+            var principalBaseIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalBaseId", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("PrincipalBaseId", principalBaseIdColumnBase);
+            var principalDerivedDependentBasebyteIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalDerived<DependentBase<byte?>>Id", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumnBase);
+            var refTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase);
+            var refTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase);
+            var refTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase);
+            var refTypeListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeList", refTypeListColumnBase);
+            var valueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase);
+            var valueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase);
+            var valueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase);
+            var valueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase = new TableMappingBase<ColumnMappingBase>(principalBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, false);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase, false);
+            defaultTableMappings0.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase0, principalBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalBase.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalBase.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalBase.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalBase.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase, principalBase.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalDerivedDependentBasebyteIdColumnBase, principalBase.FindProperty("PrincipalDerivedId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalBase.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalBase.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalBase.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalBase.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalBase.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalBase.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalBase.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalBase.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+
+            var tableMappings0 = new List<TableMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings0);
+            var principalBaseTable = new Table("PrincipalBase", "TPC", relationalModel);
+            var idColumn0 = new Column("Id", "decimal(20,0)", principalBaseTable);
+            principalBaseTable.Columns.Add("Id", idColumn0);
+            idColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(idColumn0);
+            var enum1Column = new Column("Enum1", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("Enum1", enum1Column);
+            enum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum1Column);
+            var enum2Column = new Column("Enum2", "integer", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Enum2", enum2Column);
+            enum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum2Column);
+            var flagsEnum1Column = new Column("FlagsEnum1", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum1", flagsEnum1Column);
+            flagsEnum1Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum1Column);
+            var flagsEnum2Column = new Column("FlagsEnum2", "integer", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum2", flagsEnum2Column);
+            flagsEnum2Column.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum2Column);
+            var principalBaseIdColumn = new Column("PrincipalBaseId", "decimal(20,0)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("PrincipalBaseId", principalBaseIdColumn);
+            principalBaseIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(principalBaseIdColumn);
+            var principalDerivedDependentBasebyteIdColumn = new Column("PrincipalDerived<DependentBase<byte?>>Id", "decimal(20,0)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumn);
+            principalDerivedDependentBasebyteIdColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(principalDerivedDependentBasebyteIdColumn);
+            var refTypeArrayColumn = new Column("RefTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeArray", refTypeArrayColumn);
+            refTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeArrayColumn);
+            var refTypeEnumerableColumn = new Column("RefTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn);
+            refTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeEnumerableColumn);
+            var refTypeIListColumn = new Column("RefTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeIList", refTypeIListColumn);
+            refTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeIListColumn);
+            var refTypeListColumn = new Column("RefTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeList", refTypeListColumn);
+            refTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeListColumn);
+            var valueTypeArrayColumn = new Column("ValueTypeArray", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn);
+            valueTypeArrayColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeArrayColumn);
+            var valueTypeEnumerableColumn = new Column("ValueTypeEnumerable", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn);
+            valueTypeEnumerableColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeEnumerableColumn);
+            var valueTypeIListColumn = new Column("ValueTypeIList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeIList", valueTypeIListColumn);
+            valueTypeIListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeIListColumn);
+            var valueTypeListColumn = new Column("ValueTypeList", "varchar(255)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeList", valueTypeListColumn);
+            valueTypeListColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeListColumn);
+            relationalModel.Tables.Add(("PrincipalBase", "TPC"), principalBaseTable);
+            var principalBaseTableMapping = new TableMapping(principalBase, principalBaseTable, false);
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping, false);
+            tableMappings0.Add(principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn0, principalBase.FindProperty("Id")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum1Column, principalBase.FindProperty("Enum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum2Column, principalBase.FindProperty("Enum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalBase.FindProperty("FlagsEnum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalBase.FindProperty("FlagsEnum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(principalDerivedDependentBasebyteIdColumn, principalBase.FindProperty("PrincipalDerivedId")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalBase.FindProperty("RefTypeList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseTableMapping);
+            var pK_PrincipalBase = new UniqueConstraint("PK_PrincipalBase", principalBaseTable, new[] { idColumn0 });
+            principalBaseTable.PrimaryKey = pK_PrincipalBase;
+            pK_PrincipalBase.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<long>(pK_PrincipalBase));
+            var pK_PrincipalBaseKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            pK_PrincipalBase.MappedKeys.Add(pK_PrincipalBaseKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_PrincipalBaseKey).Add(pK_PrincipalBase);
+            principalBaseTable.UniqueConstraints.Add("PK_PrincipalBase", pK_PrincipalBase);
+            var iX_PrincipalBase_PrincipalDerivedDependentBasebyteId = new TableIndex(
+            "IX_PrincipalBase_PrincipalDerived<DependentBase<byte?>>Id", principalBaseTable, new[] { principalDerivedDependentBasebyteIdColumn }, false);
+            iX_PrincipalBase_PrincipalDerivedDependentBasebyteId.SetRowIndexValueFactory(new SimpleRowIndexValueFactory<long>(iX_PrincipalBase_PrincipalDerivedDependentBasebyteId));
+            var iX_PrincipalBase_PrincipalDerivedDependentBasebyteIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalDerivedId" });
+            iX_PrincipalBase_PrincipalDerivedDependentBasebyteId.MappedIndexes.Add(iX_PrincipalBase_PrincipalDerivedDependentBasebyteIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBase_PrincipalDerivedDependentBasebyteIdIx).Add(iX_PrincipalBase_PrincipalDerivedDependentBasebyteId);
+            principalBaseTable.Indexes.Add("IX_PrincipalBase_PrincipalDerived<DependentBase<byte?>>Id", iX_PrincipalBase_PrincipalDerivedDependentBasebyteId);
+            var pIX = new TableIndex(
+            "PIX", principalBaseTable, new[] { principalBaseIdColumn }, true);
+            pIX.SetRowIndexValueFactory(new SimpleRowIndexValueFactory<long>(pIX));
+            var pIXIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                "PrincipalIndex");
+            pIX.MappedIndexes.Add(pIXIx);
+            RelationalModel.GetOrCreateTableIndexes(pIXIx).Add(pIX);
+            principalBaseTable.Indexes.Add("PIX", pIX);
+
+            var viewMappings = new List<ViewMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:ViewMappings", viewMappings);
+            var principalBaseViewView = new View("PrincipalBaseView", "TPC", relationalModel);
+            var enum1ViewColumn = new ViewColumn("Enum1", "integer", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Enum1", enum1ViewColumn);
+            var enum2ViewColumn = new ViewColumn("Enum2", "integer", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("Enum2", enum2ViewColumn);
+            var flagsEnum1ViewColumn = new ViewColumn("FlagsEnum1", "integer", principalBaseViewView);
+            principalBaseViewView.Columns.Add("FlagsEnum1", flagsEnum1ViewColumn);
+            var flagsEnum2ViewColumn = new ViewColumn("FlagsEnum2", "integer", principalBaseViewView);
+            principalBaseViewView.Columns.Add("FlagsEnum2", flagsEnum2ViewColumn);
+            var idViewColumn = new ViewColumn("Id", "decimal(20,0)", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Id", idViewColumn);
+            var principalBaseIdViewColumn = new ViewColumn("PrincipalBaseId", "decimal(20,0)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("PrincipalBaseId", principalBaseIdViewColumn);
+            var principalDerivedIdViewColumn = new ViewColumn("PrincipalDerivedId", "decimal(20,0)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("PrincipalDerivedId", principalDerivedIdViewColumn);
+            var refTypeArrayViewColumn = new ViewColumn("RefTypeArray", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeArray", refTypeArrayViewColumn);
+            var refTypeEnumerableViewColumn = new ViewColumn("RefTypeEnumerable", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeEnumerable", refTypeEnumerableViewColumn);
+            var refTypeIListViewColumn = new ViewColumn("RefTypeIList", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeIList", refTypeIListViewColumn);
+            var refTypeListViewColumn = new ViewColumn("RefTypeList", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeList", refTypeListViewColumn);
+            var valueTypeArrayViewColumn = new ViewColumn("ValueTypeArray", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeArray", valueTypeArrayViewColumn);
+            var valueTypeEnumerableViewColumn = new ViewColumn("ValueTypeEnumerable", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableViewColumn);
+            var valueTypeIListViewColumn = new ViewColumn("ValueTypeIList", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeIList", valueTypeIListViewColumn);
+            var valueTypeListViewColumn = new ViewColumn("ValueTypeList", "varchar(255)", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeList", valueTypeListViewColumn);
+            relationalModel.Views.Add(("PrincipalBaseView", "TPC"), principalBaseViewView);
+            var principalBaseViewViewMapping = new ViewMapping(principalBase, principalBaseViewView, false);
+            principalBaseViewView.AddTypeMapping(principalBaseViewViewMapping, false);
+            viewMappings.Add(principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(idViewColumn, principalBase.FindProperty("Id")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum1ViewColumn, principalBase.FindProperty("Enum1")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum2ViewColumn, principalBase.FindProperty("Enum2")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum1ViewColumn, principalBase.FindProperty("FlagsEnum1")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum2ViewColumn, principalBase.FindProperty("FlagsEnum2")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalBaseIdViewColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalDerivedIdViewColumn, principalBase.FindProperty("PrincipalDerivedId")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeArrayViewColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeEnumerableViewColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeIListViewColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeListViewColumn, principalBase.FindProperty("RefTypeList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeArrayViewColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeEnumerableViewColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeIListViewColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeListViewColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseViewViewMapping);
+
+            var deleteSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:DeleteStoredProcedureMappings", deleteSprocMappings);
+            var principalBase_DeleteStoreSproc = new StoreStoredProcedure("PrincipalBase_Delete", "TPC", relationalModel);
+            var id_OriginalParameter = new StoreStoredProcedureParameter("Id_Original", "decimal(20,0)", 0, principalBase_DeleteStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_DeleteStoreSproc.AddParameter(id_OriginalParameter);
+            var rowsAffectedParameter = new StoreStoredProcedureParameter("RowsAffected", "integer", 1, principalBase_DeleteStoreSproc, System.Data.ParameterDirection.Output);
+            principalBase_DeleteStoreSproc.AddParameter(rowsAffectedParameter);
+            principalBase_DeleteStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Delete", "TPC"), principalBase_DeleteStoreSproc);
+            var principalBase_DeleteDSproc = (IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!;
+            var principalBase_DeleteSprocMapping = new StoredProcedureMapping(principalBase, principalBase_DeleteStoreSproc, principalBase_DeleteDSproc, principalBaseTableMapping, false);
+            principalBase_DeleteStoreSproc.AddTypeMapping(principalBase_DeleteSprocMapping, false);
+            deleteSprocMappings.Add(principalBase_DeleteSprocMapping);
+            principalBaseTableMapping.DeleteStoredProcedureMapping = principalBase_DeleteSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter, principalBase_DeleteDSproc.FindParameter("Id_Original")!, principalBase.FindProperty("Id")!, principalBase_DeleteSprocMapping);
+
+            var insertSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:InsertStoredProcedureMappings", insertSprocMappings);
+            var principalBase_InsertStoreSproc = new StoreStoredProcedure("PrincipalBase_Insert", "TPC", relationalModel);
+            var idParameter = new StoreStoredProcedureParameter("Id", "decimal(20,0)", 0, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(idParameter);
+            var principalBaseIdParameter = new StoreStoredProcedureParameter("PrincipalBaseId", "decimal(20,0)", 1, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(principalBaseIdParameter);
+            var principalDerivedIdParameter = new StoreStoredProcedureParameter("PrincipalDerivedId", "decimal(20,0)", 2, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(principalDerivedIdParameter);
+            var enum2Parameter = new StoreStoredProcedureParameter("Enum2", "integer", 3, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(enum2Parameter);
+            var flagsEnum1Parameter = new StoreStoredProcedureParameter("FlagsEnum1", "integer", 4, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(flagsEnum1Parameter);
+            var flagsEnum2Parameter = new StoreStoredProcedureParameter("FlagsEnum2", "integer", 5, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(flagsEnum2Parameter);
+            var valueTypeListParameter = new StoreStoredProcedureParameter("ValueTypeList", "varchar(255)", 6, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeListParameter);
+            var valueTypeIListParameter = new StoreStoredProcedureParameter("ValueTypeIList", "varchar(255)", 7, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeIListParameter);
+            var valueTypeArrayParameter = new StoreStoredProcedureParameter("ValueTypeArray", "varchar(255)", 8, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeArrayParameter);
+            var valueTypeEnumerableParameter = new StoreStoredProcedureParameter("ValueTypeEnumerable", "varchar(255)", 9, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeEnumerableParameter);
+            var refTypeListParameter = new StoreStoredProcedureParameter("RefTypeList", "varchar(255)", 10, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeListParameter);
+            var refTypeIListParameter = new StoreStoredProcedureParameter("RefTypeIList", "varchar(255)", 11, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeIListParameter);
+            var refTypeArrayParameter = new StoreStoredProcedureParameter("RefTypeArray", "varchar(255)", 12, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeArrayParameter);
+            var refTypeEnumerableParameter = new StoreStoredProcedureParameter("RefTypeEnumerable", "varchar(255)", 13, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeEnumerableParameter);
+            var baseEnumParameter = new StoreStoredProcedureParameter("BaseEnum", "integer", 14, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Output);
+            principalBase_InsertStoreSproc.AddParameter(baseEnumParameter);
+            principalBase_InsertStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Insert", "TPC"), principalBase_InsertStoreSproc);
+            var principalBase_InsertISproc = (IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!;
+            var principalBase_InsertSprocMapping = new StoredProcedureMapping(principalBase, principalBase_InsertStoreSproc, principalBase_InsertISproc, principalBaseTableMapping, false);
+            principalBase_InsertStoreSproc.AddTypeMapping(principalBase_InsertSprocMapping, false);
+            insertSprocMappings.Add(principalBase_InsertSprocMapping);
+            principalBaseTableMapping.InsertStoredProcedureMapping = principalBase_InsertSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(idParameter, principalBase_InsertISproc.FindParameter("Id")!, principalBase.FindProperty("Id")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(baseEnumParameter, principalBase_InsertISproc.FindParameter("BaseEnum")!, principalBase.FindProperty("Enum1")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter, principalBase_InsertISproc.FindParameter("Enum2")!, principalBase.FindProperty("Enum2")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum1")!, principalBase.FindProperty("FlagsEnum1")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum2")!, principalBase.FindProperty("FlagsEnum2")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter, principalBase_InsertISproc.FindParameter("PrincipalBaseId")!, principalBase.FindProperty("PrincipalBaseId")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalDerivedIdParameter, principalBase_InsertISproc.FindParameter("PrincipalDerivedId")!, principalBase.FindProperty("PrincipalDerivedId")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter, principalBase_InsertISproc.FindParameter("RefTypeArray")!, principalBase.FindProperty("RefTypeArray")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("RefTypeEnumerable")!, principalBase.FindProperty("RefTypeEnumerable")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter, principalBase_InsertISproc.FindParameter("RefTypeIList")!, principalBase.FindProperty("RefTypeIList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter, principalBase_InsertISproc.FindParameter("RefTypeList")!, principalBase.FindProperty("RefTypeList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter, principalBase_InsertISproc.FindParameter("ValueTypeArray")!, principalBase.FindProperty("ValueTypeArray")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("ValueTypeEnumerable")!, principalBase.FindProperty("ValueTypeEnumerable")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter, principalBase_InsertISproc.FindParameter("ValueTypeIList")!, principalBase.FindProperty("ValueTypeIList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter, principalBase_InsertISproc.FindParameter("ValueTypeList")!, principalBase.FindProperty("ValueTypeList")!, principalBase_InsertSprocMapping);
+
+            var updateSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:UpdateStoredProcedureMappings", updateSprocMappings);
+            var principalBase_UpdateStoreSproc = new StoreStoredProcedure("PrincipalBase_Update", "TPC", relationalModel);
+            var principalBaseIdParameter0 = new StoreStoredProcedureParameter("PrincipalBaseId", "decimal(20,0)", 0, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(principalBaseIdParameter0);
+            var principalDerivedIdParameter0 = new StoreStoredProcedureParameter("PrincipalDerivedId", "decimal(20,0)", 1, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(principalDerivedIdParameter0);
+            var enum1Parameter = new StoreStoredProcedureParameter("Enum1", "integer", 2, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(enum1Parameter);
+            var enum2Parameter0 = new StoreStoredProcedureParameter("Enum2", "integer", 3, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(enum2Parameter0);
+            var flagsEnum1Parameter0 = new StoreStoredProcedureParameter("FlagsEnum1", "integer", 4, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(flagsEnum1Parameter0);
+            var flagsEnum2Parameter0 = new StoreStoredProcedureParameter("FlagsEnum2", "integer", 5, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(flagsEnum2Parameter0);
+            var valueTypeListParameter0 = new StoreStoredProcedureParameter("ValueTypeList", "varchar(255)", 6, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeListParameter0);
+            var valueTypeIListParameter0 = new StoreStoredProcedureParameter("ValueTypeIList", "varchar(255)", 7, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeIListParameter0);
+            var valueTypeArrayParameter0 = new StoreStoredProcedureParameter("ValueTypeArray", "varchar(255)", 8, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeArrayParameter0);
+            var valueTypeEnumerableParameter0 = new StoreStoredProcedureParameter("ValueTypeEnumerable", "varchar(255)", 9, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeEnumerableParameter0);
+            var refTypeListParameter0 = new StoreStoredProcedureParameter("RefTypeList", "varchar(255)", 10, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeListParameter0);
+            var refTypeIListParameter0 = new StoreStoredProcedureParameter("RefTypeIList", "varchar(255)", 11, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeIListParameter0);
+            var refTypeArrayParameter0 = new StoreStoredProcedureParameter("RefTypeArray", "varchar(255)", 12, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeArrayParameter0);
+            var refTypeEnumerableParameter0 = new StoreStoredProcedureParameter("RefTypeEnumerable", "varchar(255)", 13, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeEnumerableParameter0);
+            var id_OriginalParameter0 = new StoreStoredProcedureParameter("Id_Original", "decimal(20,0)", 14, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(id_OriginalParameter0);
+            principalBase_UpdateStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Update", "TPC"), principalBase_UpdateStoreSproc);
+            var principalBase_UpdateUSproc = (IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!;
+            var principalBase_UpdateSprocMapping = new StoredProcedureMapping(principalBase, principalBase_UpdateStoreSproc, principalBase_UpdateUSproc, principalBaseTableMapping, false);
+            principalBase_UpdateStoreSproc.AddTypeMapping(principalBase_UpdateSprocMapping, false);
+            updateSprocMappings.Add(principalBase_UpdateSprocMapping);
+            principalBaseTableMapping.UpdateStoredProcedureMapping = principalBase_UpdateSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter0, principalBase_UpdateUSproc.FindParameter("Id_Original")!, principalBase.FindProperty("Id")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter, principalBase_UpdateUSproc.FindParameter("Enum1")!, principalBase.FindProperty("Enum1")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter0, principalBase_UpdateUSproc.FindParameter("Enum2")!, principalBase.FindProperty("Enum2")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum1")!, principalBase.FindProperty("FlagsEnum1")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum2")!, principalBase.FindProperty("FlagsEnum2")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter0, principalBase_UpdateUSproc.FindParameter("PrincipalBaseId")!, principalBase.FindProperty("PrincipalBaseId")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalDerivedIdParameter0, principalBase_UpdateUSproc.FindParameter("PrincipalDerivedId")!, principalBase.FindProperty("PrincipalDerivedId")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeArray")!, principalBase.FindProperty("RefTypeArray")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeEnumerable")!, principalBase.FindProperty("RefTypeEnumerable")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeIList")!, principalBase.FindProperty("RefTypeIList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeList")!, principalBase.FindProperty("RefTypeList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeArray")!, principalBase.FindProperty("ValueTypeArray")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeEnumerable")!, principalBase.FindProperty("ValueTypeEnumerable")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeIList")!, principalBase.FindProperty("ValueTypeIList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeList")!, principalBase.FindProperty("ValueTypeList")!, principalBase_UpdateSprocMapping);
+
+            var principalDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>")!;
+
+            var defaultTableMappings1 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings1);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>", null, relationalModel);
+            var enum1ColumnBase0 = new ColumnBase<ColumnMappingBase>("Enum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Enum1", enum1ColumnBase0);
+            var enum2ColumnBase0 = new ColumnBase<ColumnMappingBase>("Enum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Enum2", enum2ColumnBase0);
+            var flagsEnum1ColumnBase0 = new ColumnBase<ColumnMappingBase>("FlagsEnum1", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("FlagsEnum1", flagsEnum1ColumnBase0);
+            var flagsEnum2ColumnBase0 = new ColumnBase<ColumnMappingBase>("FlagsEnum2", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("FlagsEnum2", flagsEnum2ColumnBase0);
+            var idColumnBase1 = new ColumnBase<ColumnMappingBase>("Id", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Id", idColumnBase1);
+            var principalBaseIdColumnBase0 = new ColumnBase<ColumnMappingBase>("PrincipalBaseId", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalBaseId", principalBaseIdColumnBase0);
+            var principalDerivedDependentBasebyteIdColumnBase0 = new ColumnBase<ColumnMappingBase>("PrincipalDerived<DependentBase<byte?>>Id", "decimal(20,0)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumnBase0);
+            var refTypeArrayColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase0);
+            var refTypeEnumerableColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase0);
+            var refTypeIListColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase0);
+            var refTypeListColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("RefTypeList", refTypeListColumnBase0);
+            var valueTypeArrayColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase0);
+            var valueTypeEnumerableColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase0);
+            var valueTypeIListColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase0);
+            var valueTypeListColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeList", "varchar(255)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase0);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase, false);
+            defaultTableMappings1.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase1, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase0, principalDerived.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase0, principalDerived.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase0, principalDerived.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase0, principalDerived.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase0, principalDerived.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalDerivedDependentBasebyteIdColumnBase0, principalDerived.FindProperty("PrincipalDerivedId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase0, principalDerived.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase0, principalDerived.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase0, principalDerived.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase0, principalDerived.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase0, principalDerived.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase0, principalDerived.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase0, principalDerived.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase0, principalDerived.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+
+            var tableMappings1 = new List<TableMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings1);
+            var principalDerivedTable = new Table("PrincipalDerived", "TPC", relationalModel);
+            var idColumn1 = new Column("Id", "decimal(20,0)", principalDerivedTable);
+            principalDerivedTable.Columns.Add("Id", idColumn1);
+            idColumn1.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(idColumn1);
+            var enum1Column0 = new Column("Enum1", "integer", principalDerivedTable);
+            principalDerivedTable.Columns.Add("Enum1", enum1Column0);
+            enum1Column0.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum1Column0);
+            var enum2Column0 = new Column("Enum2", "integer", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("Enum2", enum2Column0);
+            enum2Column0.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(enum2Column0);
+            var flagsEnum1Column0 = new Column("FlagsEnum1", "integer", principalDerivedTable);
+            principalDerivedTable.Columns.Add("FlagsEnum1", flagsEnum1Column0);
+            flagsEnum1Column0.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum1Column0);
+            var flagsEnum2Column0 = new Column("FlagsEnum2", "integer", principalDerivedTable);
+            principalDerivedTable.Columns.Add("FlagsEnum2", flagsEnum2Column0);
+            flagsEnum2Column0.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(flagsEnum2Column0);
+            var principalBaseIdColumn0 = new Column("PrincipalBaseId", "decimal(20,0)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("PrincipalBaseId", principalBaseIdColumn0);
+            principalBaseIdColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(principalBaseIdColumn0);
+            var principalDerivedDependentBasebyteIdColumn0 = new Column("PrincipalDerived<DependentBase<byte?>>Id", "decimal(20,0)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumn0);
+            principalDerivedDependentBasebyteIdColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<long>(principalDerivedDependentBasebyteIdColumn0);
+            var refTypeArrayColumn0 = new Column("RefTypeArray", "varchar(255)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("RefTypeArray", refTypeArrayColumn0);
+            refTypeArrayColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeArrayColumn0);
+            var refTypeEnumerableColumn0 = new Column("RefTypeEnumerable", "varchar(255)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn0);
+            refTypeEnumerableColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeEnumerableColumn0);
+            var refTypeIListColumn0 = new Column("RefTypeIList", "varchar(255)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("RefTypeIList", refTypeIListColumn0);
+            refTypeIListColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeIListColumn0);
+            var refTypeListColumn0 = new Column("RefTypeList", "varchar(255)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("RefTypeList", refTypeListColumn0);
+            refTypeListColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(refTypeListColumn0);
+            var valueTypeArrayColumn0 = new Column("ValueTypeArray", "varchar(255)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn0);
+            valueTypeArrayColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeArrayColumn0);
+            var valueTypeEnumerableColumn0 = new Column("ValueTypeEnumerable", "varchar(255)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn0);
+            valueTypeEnumerableColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeEnumerableColumn0);
+            var valueTypeIListColumn0 = new Column("ValueTypeIList", "varchar(255)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("ValueTypeIList", valueTypeIListColumn0);
+            valueTypeIListColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeIListColumn0);
+            var valueTypeListColumn0 = new Column("ValueTypeList", "varchar(255)", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("ValueTypeList", valueTypeListColumn0);
+            valueTypeListColumn0.Accessors = ColumnAccessorsFactory.CreateGeneric<string>(valueTypeListColumn0);
+            relationalModel.Tables.Add(("PrincipalDerived", "TPC"), principalDerivedTable);
+            var principalDerivedTableMapping = new TableMapping(principalDerived, principalDerivedTable, null);
+            principalDerivedTable.AddTypeMapping(principalDerivedTableMapping, false);
+            tableMappings1.Add(principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn1, principalDerived.FindProperty("Id")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(enum1Column0, principalDerived.FindProperty("Enum1")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(enum2Column0, principalDerived.FindProperty("Enum2")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column0, principalDerived.FindProperty("FlagsEnum1")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column0, principalDerived.FindProperty("FlagsEnum2")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn0, principalDerived.FindProperty("PrincipalBaseId")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(principalDerivedDependentBasebyteIdColumn0, principalDerived.FindProperty("PrincipalDerivedId")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn0, principalDerived.FindProperty("RefTypeArray")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn0, principalDerived.FindProperty("RefTypeEnumerable")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn0, principalDerived.FindProperty("RefTypeIList")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn0, principalDerived.FindProperty("RefTypeList")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn0, principalDerived.FindProperty("ValueTypeArray")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn0, principalDerived.FindProperty("ValueTypeEnumerable")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn0, principalDerived.FindProperty("ValueTypeIList")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn0, principalDerived.FindProperty("ValueTypeList")!, principalDerivedTableMapping);
+            var pK_PrincipalDerived = new UniqueConstraint("PK_PrincipalDerived", principalDerivedTable, new[] { idColumn1 });
+            principalDerivedTable.PrimaryKey = pK_PrincipalDerived;
+            pK_PrincipalDerived.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<long>(pK_PrincipalDerived));
+            pK_PrincipalDerived.MappedKeys.Add(pK_PrincipalBaseKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_PrincipalBaseKey).Add(pK_PrincipalDerived);
+            principalDerivedTable.UniqueConstraints.Add("PK_PrincipalDerived", pK_PrincipalDerived);
+            var iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId = new TableIndex(
+            "IX_PrincipalDerived_PrincipalDerived<DependentBase<byte?>>Id", principalDerivedTable, new[] { principalDerivedDependentBasebyteIdColumn0 }, false);
+            iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId.SetRowIndexValueFactory(new SimpleRowIndexValueFactory<long>(iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId));
+            iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId.MappedIndexes.Add(iX_PrincipalBase_PrincipalDerivedDependentBasebyteIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBase_PrincipalDerivedDependentBasebyteIdIx).Add(iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId);
+            principalDerivedTable.Indexes.Add("IX_PrincipalDerived_PrincipalDerived<DependentBase<byte?>>Id", iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId);
+            var pIX0 = new TableIndex(
+            "PIX", principalDerivedTable, new[] { principalBaseIdColumn0 }, true);
+            pIX0.SetRowIndexValueFactory(new SimpleRowIndexValueFactory<long>(pIX0));
+            pIX0.MappedIndexes.Add(pIXIx);
+            RelationalModel.GetOrCreateTableIndexes(pIXIx).Add(pIX0);
+            principalDerivedTable.Indexes.Add("PIX", pIX0);
+
+            var viewMappings0 = new List<ViewMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:ViewMappings", viewMappings0);
+            var principalDerivedViewView = new View("PrincipalDerivedView", "TPC", relationalModel);
+            var enum1ViewColumn0 = new ViewColumn("Enum1", "integer", principalDerivedViewView);
+            principalDerivedViewView.Columns.Add("Enum1", enum1ViewColumn0);
+            var enum2ViewColumn0 = new ViewColumn("Enum2", "integer", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("Enum2", enum2ViewColumn0);
+            var flagsEnum1ViewColumn0 = new ViewColumn("FlagsEnum1", "integer", principalDerivedViewView);
+            principalDerivedViewView.Columns.Add("FlagsEnum1", flagsEnum1ViewColumn0);
+            var flagsEnum2ViewColumn0 = new ViewColumn("FlagsEnum2", "integer", principalDerivedViewView);
+            principalDerivedViewView.Columns.Add("FlagsEnum2", flagsEnum2ViewColumn0);
+            var idViewColumn0 = new ViewColumn("Id", "decimal(20,0)", principalDerivedViewView);
+            principalDerivedViewView.Columns.Add("Id", idViewColumn0);
+            var principalBaseIdViewColumn0 = new ViewColumn("PrincipalBaseId", "decimal(20,0)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("PrincipalBaseId", principalBaseIdViewColumn0);
+            var principalDerivedIdViewColumn0 = new ViewColumn("PrincipalDerivedId", "decimal(20,0)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("PrincipalDerivedId", principalDerivedIdViewColumn0);
+            var refTypeArrayViewColumn0 = new ViewColumn("RefTypeArray", "varchar(255)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("RefTypeArray", refTypeArrayViewColumn0);
+            var refTypeEnumerableViewColumn0 = new ViewColumn("RefTypeEnumerable", "varchar(255)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("RefTypeEnumerable", refTypeEnumerableViewColumn0);
+            var refTypeIListViewColumn0 = new ViewColumn("RefTypeIList", "varchar(255)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("RefTypeIList", refTypeIListViewColumn0);
+            var refTypeListViewColumn0 = new ViewColumn("RefTypeList", "varchar(255)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("RefTypeList", refTypeListViewColumn0);
+            var valueTypeArrayViewColumn0 = new ViewColumn("ValueTypeArray", "varchar(255)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("ValueTypeArray", valueTypeArrayViewColumn0);
+            var valueTypeEnumerableViewColumn0 = new ViewColumn("ValueTypeEnumerable", "varchar(255)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableViewColumn0);
+            var valueTypeIListViewColumn0 = new ViewColumn("ValueTypeIList", "varchar(255)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("ValueTypeIList", valueTypeIListViewColumn0);
+            var valueTypeListViewColumn0 = new ViewColumn("ValueTypeList", "varchar(255)", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("ValueTypeList", valueTypeListViewColumn0);
+            relationalModel.Views.Add(("PrincipalDerivedView", "TPC"), principalDerivedViewView);
+            var principalDerivedViewViewMapping = new ViewMapping(principalDerived, principalDerivedViewView, null);
+            principalDerivedViewView.AddTypeMapping(principalDerivedViewViewMapping, false);
+            viewMappings0.Add(principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(idViewColumn0, principalDerived.FindProperty("Id")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum1ViewColumn0, principalDerived.FindProperty("Enum1")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum2ViewColumn0, principalDerived.FindProperty("Enum2")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum1ViewColumn0, principalDerived.FindProperty("FlagsEnum1")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum2ViewColumn0, principalDerived.FindProperty("FlagsEnum2")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalBaseIdViewColumn0, principalDerived.FindProperty("PrincipalBaseId")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalDerivedIdViewColumn0, principalDerived.FindProperty("PrincipalDerivedId")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeArrayViewColumn0, principalDerived.FindProperty("RefTypeArray")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeEnumerableViewColumn0, principalDerived.FindProperty("RefTypeEnumerable")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeIListViewColumn0, principalDerived.FindProperty("RefTypeIList")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeListViewColumn0, principalDerived.FindProperty("RefTypeList")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeArrayViewColumn0, principalDerived.FindProperty("ValueTypeArray")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeEnumerableViewColumn0, principalDerived.FindProperty("ValueTypeEnumerable")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeIListViewColumn0, principalDerived.FindProperty("ValueTypeIList")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeListViewColumn0, principalDerived.FindProperty("ValueTypeList")!, principalDerivedViewViewMapping);
+
+            var deleteSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:DeleteStoredProcedureMappings", deleteSprocMappings0);
+            var derived_DeleteStoreSproc = new StoreStoredProcedure("Derived_Delete", "TPC", relationalModel);
+            var id_OriginalParameter1 = new StoreStoredProcedureParameter("Id_Original", "decimal(20,0)", 0, derived_DeleteStoreSproc, System.Data.ParameterDirection.Input);
+            derived_DeleteStoreSproc.AddParameter(id_OriginalParameter1);
+            derived_DeleteStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalDerived.GetDeleteStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("Derived_Delete", "TPC"), derived_DeleteStoreSproc);
+            var derived_DeleteDSproc = (IRuntimeStoredProcedure)principalDerived.GetDeleteStoredProcedure()!;
+            var derived_DeleteSprocMapping = new StoredProcedureMapping(principalDerived, derived_DeleteStoreSproc, derived_DeleteDSproc, principalDerivedTableMapping, null);
+            derived_DeleteStoreSproc.AddTypeMapping(derived_DeleteSprocMapping, false);
+            deleteSprocMappings0.Add(derived_DeleteSprocMapping);
+            principalDerivedTableMapping.DeleteStoredProcedureMapping = derived_DeleteSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter1, derived_DeleteDSproc.FindParameter("Id_Original")!, principalDerived.FindProperty("Id")!, derived_DeleteSprocMapping);
+
+            var insertSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:InsertStoredProcedureMappings", insertSprocMappings0);
+            var derived_InsertStoreSproc = new StoreStoredProcedure("Derived_Insert", "TPC", relationalModel);
+            var idParameter0 = new StoreStoredProcedureParameter("Id", "decimal(20,0)", 0, derived_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            derived_InsertStoreSproc.AddParameter(idParameter0);
+            var principalBaseIdParameter1 = new StoreStoredProcedureParameter("PrincipalBaseId", "decimal(20,0)", 1, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(principalBaseIdParameter1);
+            var principalDerivedIdParameter1 = new StoreStoredProcedureParameter("PrincipalDerivedId", "decimal(20,0)", 2, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(principalDerivedIdParameter1);
+            var enum2Parameter1 = new StoreStoredProcedureParameter("Enum2", "integer", 3, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(enum2Parameter1);
+            var flagsEnum1Parameter1 = new StoreStoredProcedureParameter("FlagsEnum1", "integer", 4, derived_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            derived_InsertStoreSproc.AddParameter(flagsEnum1Parameter1);
+            var flagsEnum2Parameter1 = new StoreStoredProcedureParameter("FlagsEnum2", "integer", 5, derived_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            derived_InsertStoreSproc.AddParameter(flagsEnum2Parameter1);
+            var valueTypeListParameter1 = new StoreStoredProcedureParameter("ValueTypeList", "varchar(255)", 6, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(valueTypeListParameter1);
+            var valueTypeIListParameter1 = new StoreStoredProcedureParameter("ValueTypeIList", "varchar(255)", 7, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(valueTypeIListParameter1);
+            var valueTypeArrayParameter1 = new StoreStoredProcedureParameter("ValueTypeArray", "varchar(255)", 8, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(valueTypeArrayParameter1);
+            var valueTypeEnumerableParameter1 = new StoreStoredProcedureParameter("ValueTypeEnumerable", "varchar(255)", 9, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(valueTypeEnumerableParameter1);
+            var refTypeListParameter1 = new StoreStoredProcedureParameter("RefTypeList", "varchar(255)", 10, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(refTypeListParameter1);
+            var refTypeIListParameter1 = new StoreStoredProcedureParameter("RefTypeIList", "varchar(255)", 11, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(refTypeIListParameter1);
+            var refTypeArrayParameter1 = new StoreStoredProcedureParameter("RefTypeArray", "varchar(255)", 12, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(refTypeArrayParameter1);
+            var refTypeEnumerableParameter1 = new StoreStoredProcedureParameter("RefTypeEnumerable", "varchar(255)", 13, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(refTypeEnumerableParameter1);
+            var derivedEnumFunctionColumn = new StoreStoredProcedureResultColumn("DerivedEnum", "integer", 0, derived_InsertStoreSproc);
+            derived_InsertStoreSproc.AddResultColumn(derivedEnumFunctionColumn);
+            derived_InsertStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalDerived.GetInsertStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("Derived_Insert", "TPC"), derived_InsertStoreSproc);
+            var derived_InsertISproc = (IRuntimeStoredProcedure)principalDerived.GetInsertStoredProcedure()!;
+            var derived_InsertSprocMapping = new StoredProcedureMapping(principalDerived, derived_InsertStoreSproc, derived_InsertISproc, principalDerivedTableMapping, null);
+            derived_InsertStoreSproc.AddTypeMapping(derived_InsertSprocMapping, false);
+            insertSprocMappings0.Add(derived_InsertSprocMapping);
+            principalDerivedTableMapping.InsertStoredProcedureMapping = derived_InsertSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(idParameter0, derived_InsertISproc.FindParameter("Id")!, principalDerived.FindProperty("Id")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter1, derived_InsertISproc.FindParameter("Enum2")!, principalDerived.FindProperty("Enum2")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter1, derived_InsertISproc.FindParameter("FlagsEnum1")!, principalDerived.FindProperty("FlagsEnum1")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter1, derived_InsertISproc.FindParameter("FlagsEnum2")!, principalDerived.FindProperty("FlagsEnum2")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter1, derived_InsertISproc.FindParameter("PrincipalBaseId")!, principalDerived.FindProperty("PrincipalBaseId")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalDerivedIdParameter1, derived_InsertISproc.FindParameter("PrincipalDerivedId")!, principalDerived.FindProperty("PrincipalDerivedId")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter1, derived_InsertISproc.FindParameter("RefTypeArray")!, principalDerived.FindProperty("RefTypeArray")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter1, derived_InsertISproc.FindParameter("RefTypeEnumerable")!, principalDerived.FindProperty("RefTypeEnumerable")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter1, derived_InsertISproc.FindParameter("RefTypeIList")!, principalDerived.FindProperty("RefTypeIList")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter1, derived_InsertISproc.FindParameter("RefTypeList")!, principalDerived.FindProperty("RefTypeList")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter1, derived_InsertISproc.FindParameter("ValueTypeArray")!, principalDerived.FindProperty("ValueTypeArray")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter1, derived_InsertISproc.FindParameter("ValueTypeEnumerable")!, principalDerived.FindProperty("ValueTypeEnumerable")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter1, derived_InsertISproc.FindParameter("ValueTypeIList")!, principalDerived.FindProperty("ValueTypeIList")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter1, derived_InsertISproc.FindParameter("ValueTypeList")!, principalDerived.FindProperty("ValueTypeList")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureResultColumnMapping(derivedEnumFunctionColumn, derived_InsertISproc.FindResultColumn("DerivedEnum")!, principalDerived.FindProperty("Enum1")!, derived_InsertSprocMapping);
+
+            var updateSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:UpdateStoredProcedureMappings", updateSprocMappings0);
+            var derived_UpdateStoreSproc = new StoreStoredProcedure("Derived_Update", "Derived", relationalModel);
+            var principalBaseIdParameter2 = new StoreStoredProcedureParameter("PrincipalBaseId", "decimal(20,0)", 0, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(principalBaseIdParameter2);
+            var principalDerivedIdParameter2 = new StoreStoredProcedureParameter("PrincipalDerivedId", "decimal(20,0)", 1, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(principalDerivedIdParameter2);
+            var enum1Parameter0 = new StoreStoredProcedureParameter("Enum1", "integer", 2, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            derived_UpdateStoreSproc.AddParameter(enum1Parameter0);
+            var enum2Parameter2 = new StoreStoredProcedureParameter("Enum2", "integer", 3, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(enum2Parameter2);
+            var flagsEnum1Parameter2 = new StoreStoredProcedureParameter("FlagsEnum1", "integer", 4, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            derived_UpdateStoreSproc.AddParameter(flagsEnum1Parameter2);
+            var flagsEnum2Parameter2 = new StoreStoredProcedureParameter("FlagsEnum2", "integer", 5, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            derived_UpdateStoreSproc.AddParameter(flagsEnum2Parameter2);
+            var valueTypeListParameter2 = new StoreStoredProcedureParameter("ValueTypeList", "varchar(255)", 6, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(valueTypeListParameter2);
+            var valueTypeIListParameter2 = new StoreStoredProcedureParameter("ValueTypeIList", "varchar(255)", 7, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(valueTypeIListParameter2);
+            var valueTypeArrayParameter2 = new StoreStoredProcedureParameter("ValueTypeArray", "varchar(255)", 8, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(valueTypeArrayParameter2);
+            var valueTypeEnumerableParameter2 = new StoreStoredProcedureParameter("ValueTypeEnumerable", "varchar(255)", 9, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(valueTypeEnumerableParameter2);
+            var refTypeListParameter2 = new StoreStoredProcedureParameter("RefTypeList", "varchar(255)", 10, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(refTypeListParameter2);
+            var refTypeIListParameter2 = new StoreStoredProcedureParameter("RefTypeIList", "varchar(255)", 11, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(refTypeIListParameter2);
+            var refTypeArrayParameter2 = new StoreStoredProcedureParameter("RefTypeArray", "varchar(255)", 12, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(refTypeArrayParameter2);
+            var refTypeEnumerableParameter2 = new StoreStoredProcedureParameter("RefTypeEnumerable", "varchar(255)", 13, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(refTypeEnumerableParameter2);
+            var id_OriginalParameter2 = new StoreStoredProcedureParameter("Id_Original", "decimal(20,0)", 14, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            derived_UpdateStoreSproc.AddParameter(id_OriginalParameter2);
+            derived_UpdateStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalDerived.GetUpdateStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("Derived_Update", "Derived"), derived_UpdateStoreSproc);
+            var derived_UpdateUSproc = (IRuntimeStoredProcedure)principalDerived.GetUpdateStoredProcedure()!;
+            var derived_UpdateSprocMapping = new StoredProcedureMapping(principalDerived, derived_UpdateStoreSproc, derived_UpdateUSproc, principalDerivedTableMapping, null);
+            derived_UpdateStoreSproc.AddTypeMapping(derived_UpdateSprocMapping, false);
+            updateSprocMappings0.Add(derived_UpdateSprocMapping);
+            principalDerivedTableMapping.UpdateStoredProcedureMapping = derived_UpdateSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter2, derived_UpdateUSproc.FindParameter("Id_Original")!, principalDerived.FindProperty("Id")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter0, derived_UpdateUSproc.FindParameter("Enum1")!, principalDerived.FindProperty("Enum1")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter2, derived_UpdateUSproc.FindParameter("Enum2")!, principalDerived.FindProperty("Enum2")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter2, derived_UpdateUSproc.FindParameter("FlagsEnum1")!, principalDerived.FindProperty("FlagsEnum1")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter2, derived_UpdateUSproc.FindParameter("FlagsEnum2")!, principalDerived.FindProperty("FlagsEnum2")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter2, derived_UpdateUSproc.FindParameter("PrincipalBaseId")!, principalDerived.FindProperty("PrincipalBaseId")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalDerivedIdParameter2, derived_UpdateUSproc.FindParameter("PrincipalDerivedId")!, principalDerived.FindProperty("PrincipalDerivedId")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter2, derived_UpdateUSproc.FindParameter("RefTypeArray")!, principalDerived.FindProperty("RefTypeArray")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter2, derived_UpdateUSproc.FindParameter("RefTypeEnumerable")!, principalDerived.FindProperty("RefTypeEnumerable")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter2, derived_UpdateUSproc.FindParameter("RefTypeIList")!, principalDerived.FindProperty("RefTypeIList")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter2, derived_UpdateUSproc.FindParameter("RefTypeList")!, principalDerived.FindProperty("RefTypeList")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter2, derived_UpdateUSproc.FindParameter("ValueTypeArray")!, principalDerived.FindProperty("ValueTypeArray")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter2, derived_UpdateUSproc.FindParameter("ValueTypeEnumerable")!, principalDerived.FindProperty("ValueTypeEnumerable")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter2, derived_UpdateUSproc.FindParameter("ValueTypeIList")!, principalDerived.FindProperty("ValueTypeIList")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter2, derived_UpdateUSproc.FindParameter("ValueTypeList")!, principalDerived.FindProperty("ValueTypeList")!, derived_UpdateSprocMapping);
+            var fK_DependentBasebyte_PrincipalDerived_PrincipalId = new ForeignKeyConstraint(
+                "FK_DependentBase<byte?>_PrincipalDerived_PrincipalId", dependentBasebyteTable, principalDerivedTable,
+                new[] { principalIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK_PrincipalDerived")!, ReferentialAction.NoAction);
+            fK_DependentBasebyte_PrincipalDerived_PrincipalId.SetRowForeignKeyValueFactory(RowForeignKeyValueFactoryFactory.CreateSimpleNonNullableFactory<long, long>(fK_DependentBasebyte_PrincipalDerived_PrincipalId));
+            var fK_DependentBasebyte_PrincipalDerived_PrincipalIdFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id" });
+            fK_DependentBasebyte_PrincipalDerived_PrincipalId.MappedForeignKeys.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalIdFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_DependentBasebyte_PrincipalDerived_PrincipalIdFk).Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId);
+            dependentBasebyteTable.ForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId);
+            var fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas = new ForeignKeyConstraint(
+                "FK_PrincipalBase_PrincipalDerived_PrincipalDerived<DependentBas~", principalBaseTable, principalDerivedTable,
+                new[] { principalDerivedDependentBasebyteIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK_PrincipalDerived")!, ReferentialAction.NoAction);
+            fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas.SetRowForeignKeyValueFactory(RowForeignKeyValueFactoryFactory.CreateSimpleNonNullableFactory<long, long>(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas));
+            var fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBasFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalDerivedId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id" });
+            fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas.MappedForeignKeys.Add(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBasFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBasFk).Add(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas);
+            principalBaseTable.ForeignKeyConstraints.Add(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas);
+            var fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent = new ForeignKeyConstraint(
+                "FK_PrincipalDerived_PrincipalDerived_PrincipalDerived<Dependent~", principalDerivedTable, principalDerivedTable,
+                new[] { principalDerivedDependentBasebyteIdColumn0 },
+                principalDerivedTable.FindUniqueConstraint("PK_PrincipalDerived")!, ReferentialAction.NoAction);
+            fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent.SetRowForeignKeyValueFactory(RowForeignKeyValueFactoryFactory.CreateSimpleNonNullableFactory<long, long>(fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent));
+            fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent.MappedForeignKeys.Add(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBasFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBasFk).Add(fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent);
+            principalDerivedTable.ForeignKeyConstraints.Add(fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DependentBaseEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DependentBaseEntityType.cs
new file mode 100644
index 00000000..9035b568
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DependentBaseEntityType.cs
@@ -0,0 +1,254 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DependentBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                baseEntityType,
+                propertyCount: 2,
+                navigationCount: 1,
+                foreignKeyCount: 1,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Id", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            id.SetGetter(
+                byte? (CompiledModelTestBase.DependentBase<byte?> instance) => DependentBaseUnsafeAccessors<byte?>.Id(instance),
+                bool (CompiledModelTestBase.DependentBase<byte?> instance) => !(DependentBaseUnsafeAccessors<byte?>.Id(instance).HasValue));
+            id.SetSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, byte? value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, byte? value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                byte? (IInternalEntry entry) => entry.ReadOriginalValue<byte?>(id, 0),
+                byte? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<byte?>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: -1);
+            id.TypeMapping = JetByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                keyComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<byte?>(id));
+            id.SetComparer(new NullableValueComparer<byte>(id.TypeMapping.Comparer));
+            id.SetKeyComparer(new NullableValueComparer<byte>(id.TypeMapping.KeyComparer));
+
+            var principalId = runtimeEntityType.AddProperty(
+                "PrincipalId",
+                typeof(long?),
+                nullable: true);
+            principalId.SetAccessors(
+                long? (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<long?>(0) : (entry.FlaggedAsTemporary(1) && !(entry.ReadShadowValue<long?>(0).HasValue) ? entry.ReadTemporaryValue<long?>(0) : entry.ReadShadowValue<long?>(0))),
+                long? (IInternalEntry entry) => entry.ReadShadowValue<long?>(0),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(principalId, 1),
+                long? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long?>(principalId, 1));
+            principalId.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: 0,
+                relationshipIndex: 1,
+                storeGenerationIndex: 0);
+            principalId.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            principalId.SetCurrentValueComparer(new EntryCurrentValueComparer<long?>(principalId));
+            principalId.SetComparer(new NullableValueComparer<long>(principalId.TypeMapping.Comparer));
+            principalId.SetKeyComparer(new NullableValueComparer<long>(principalId.TypeMapping.KeyComparer));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalId },
+                unique: true);
+            index.AddAnnotation("Relational:Filter", "IGNORE NULL");
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.ClientCascade,
+                unique: true,
+                requiredDependent: true);
+
+            var principal = declaringEntityType.AddNavigation("Principal",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Principal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Principal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            principal.SetGetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.DependentBase<byte?> instance) => DependentBaseUnsafeAccessors<byte?>.Principal(instance),
+                bool (CompiledModelTestBase.DependentBase<byte?> instance) => DependentBaseUnsafeAccessors<byte?>.Principal(instance) == null);
+            principal.SetSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Principal(instance) = value;
+                    return instance;
+                });
+            principal.SetMaterializationSetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.DependentBase<byte?> instance, CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> value) =>
+                {
+                    DependentBaseUnsafeAccessors<byte?>.Principal(instance) = value;
+                    return instance;
+                });
+            principal.SetAccessors(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
+                null,
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>>(principal));
+            principal.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 2,
+                storeGenerationIndex: -1);
+            var dependent = principalEntityType.AddNavigation("Dependent",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Dependent", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Dependent>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            dependent.SetGetter(
+                CompiledModelTestBase.DependentBase<byte?> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance),
+                bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance) == null);
+            dependent.SetSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, CompiledModelTestBase.DependentBase<byte?> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance) = value;
+                    return instance;
+                });
+            dependent.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, CompiledModelTestBase.DependentBase<byte?> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(instance) = value;
+                    return instance;
+                });
+            dependent.SetAccessors(
+                CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                null,
+                CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.DependentBase<byte?>>(dependent));
+            dependent.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 4,
+                storeGenerationIndex: -1);
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var principalId = runtimeEntityType.FindProperty("PrincipalId");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNullableFactory<byte?, byte>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<byte?>(key));
+            var principal = runtimeEntityType.FindNavigation("Principal");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.DependentBase<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<byte?, long?>((source.GetCurrentValue<byte?>(id) == null ? null : ((ValueComparer<byte?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<byte?>(id))), (source.GetCurrentValue<long?>(principalId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalId).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalId))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long?>((default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)principalId).GetValueComparer())).Snapshot(default(long? )))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<long?>(default(long? )))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long?>((source.ContainsKey("PrincipalId") ? ((long? )(source["PrincipalId"])) : null)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long?>(default(long? )))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.DependentBase<byte?>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<byte?, long?, object>((source.GetCurrentValue<byte?>(id) == null ? null : ((ValueComparer<byte?>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<byte?>(id))), (source.GetCurrentValue<long?>(principalId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalId))), source.GetCurrentValue<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>>(principal))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 2,
+                navigationCount: 1,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 2,
+                shadowCount: 1,
+                relationshipCount: 3,
+                storeGeneratedCount: 1));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", "TPC");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DependentBaseUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DependentBaseUnsafeAccessors.cs
new file mode 100644
index 00000000..d7a27e94
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/DependentBaseUnsafeAccessors.cs
@@ -0,0 +1,18 @@
+// <auto-generated />
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DependentBaseUnsafeAccessors<TKey>
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref TKey Id(CompiledModelTestBase.DependentBase<TKey> @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Principal>k__BackingField")]
+        public static extern ref CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<TKey>> Principal(CompiledModelTestBase.DependentBase<TKey> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalBaseEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalBaseEntityType.cs
new file mode 100644
index 00000000..2e2ddc68
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalBaseEntityType.cs
@@ -0,0 +1,1249 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                typeof(CompiledModelTestBase.PrincipalBase),
+                baseEntityType,
+                discriminatorValue: "PrincipalBase",
+                derivedTypesCount: 1,
+                propertyCount: 15,
+                navigationCount: 1,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                namedIndexCount: 1,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            id.SetGetter(
+                long? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Id(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Id(instance).HasValue));
+            id.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, long? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Id(instance) = value;
+                    return instance;
+                });
+            id.SetAccessors(
+                long? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                long? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Id(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(id, 0),
+                long? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long?>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: -1,
+                relationshipIndex: 0,
+                storeGenerationIndex: -1);
+            id.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<long?>(id));
+            id.SetComparer(new NullableValueComparer<long>(id.TypeMapping.Comparer));
+            id.SetKeyComparer(new NullableValueComparer<long>(id.TypeMapping.KeyComparer));
+
+            var overrides = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var idPrincipalBaseView = new RuntimeRelationalPropertyOverrides(
+                id,
+                StoreObjectIdentifier.View("PrincipalBaseView", "TPC"),
+                false,
+                null);
+            idPrincipalBaseView.AddAnnotation("foo", "bar2");
+            overrides.Add(StoreObjectIdentifier.View("PrincipalBaseView", "TPC"), idPrincipalBaseView);
+            id.AddAnnotation("Relational:RelationalOverrides", overrides);
+
+
+            var enum1 = runtimeEntityType.AddProperty(
+                "Enum1",
+                typeof(CompiledModelTestBase.AnEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd);
+            enum1.SetGetter(
+                CompiledModelTestBase.AnEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum1(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.Enum1(instance))), ((object)(CompiledModelTestBase.AnEnum.A))));
+            enum1.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                    return instance;
+                });
+            enum1.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum1(instance) = value;
+                    return instance;
+                });
+            enum1.SetAccessors(
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<CompiledModelTestBase.AnEnum>(0) : (entry.FlaggedAsTemporary(1) && object.Equals(((object)(PrincipalBaseUnsafeAccessors.Enum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))), ((object)(CompiledModelTestBase.AnEnum.A))) ? entry.ReadTemporaryValue<CompiledModelTestBase.AnEnum>(0) : PrincipalBaseUnsafeAccessors.Enum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))))),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum>(enum1, 1),
+                CompiledModelTestBase.AnEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1));
+            enum1.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: 0);
+            enum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                    CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                        CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+            enum1.SetSentinelFromProviderValue(1);
+
+            var overrides0 = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var enum1Derived_Insert = new RuntimeRelationalPropertyOverrides(
+                enum1,
+                StoreObjectIdentifier.InsertStoredProcedure("Derived_Insert", "TPC"),
+                true,
+                "DerivedEnum");
+            overrides0.Add(StoreObjectIdentifier.InsertStoredProcedure("Derived_Insert", "TPC"), enum1Derived_Insert);
+            enum1.AddAnnotation("Relational:RelationalOverrides", overrides0);
+
+            enum1.AddAnnotation("Relational:DefaultValue", CompiledModelTestBase.AnEnum.A);
+
+            var enum2 = runtimeEntityType.AddProperty(
+                "Enum2",
+                typeof(CompiledModelTestBase.AnEnum?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            enum2.SetGetter(
+                CompiledModelTestBase.AnEnum? (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Enum2(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => !(PrincipalBaseUnsafeAccessors.Enum2(instance).HasValue));
+            enum2.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                    return instance;
+                });
+            enum2.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AnEnum? value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Enum2(instance) = (value == null ? value : ((CompiledModelTestBase.AnEnum? )(((CompiledModelTestBase.AnEnum)value))));
+                    return instance;
+                });
+            enum2.SetAccessors(
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Enum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AnEnum?>(enum2, 2),
+                CompiledModelTestBase.AnEnum? (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2));
+            enum2.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: 2,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            enum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                    CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        int (CompiledModelTestBase.AnEnum value) => ((int)value),
+                        CompiledModelTestBase.AnEnum (int value) => ((CompiledModelTestBase.AnEnum)value))));
+            enum2.SetComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.Comparer));
+            enum2.SetKeyComparer(new NullableValueComparer<CompiledModelTestBase.AnEnum>(enum2.TypeMapping.KeyComparer));
+
+            var flagsEnum1 = runtimeEntityType.AddProperty(
+                "FlagsEnum1",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum1.SetGetter(
+                CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum1(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum1(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+            flagsEnum1.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                    return instance;
+                });
+            flagsEnum1.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum1(instance) = value;
+                    return instance;
+                });
+            flagsEnum1.SetAccessors(
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum1(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1, 3),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1));
+            flagsEnum1.SetPropertyIndexes(
+                index: 3,
+                originalValueIndex: 3,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            flagsEnum1.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                    CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                        CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+            flagsEnum1.SetSentinelFromProviderValue(0);
+
+            var flagsEnum2 = runtimeEntityType.AddProperty(
+                "FlagsEnum2",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum2.SetGetter(
+                CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.FlagsEnum2(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => object.Equals(((object)(PrincipalBaseUnsafeAccessors.FlagsEnum2(instance))), ((object)((CompiledModelTestBase.AFlagsEnum)0L))));
+            flagsEnum2.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum2(instance) = value;
+                    return instance;
+                });
+            flagsEnum2.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, CompiledModelTestBase.AFlagsEnum value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.FlagsEnum2(instance) = value;
+                    return instance;
+                });
+            flagsEnum2.SetAccessors(
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.FlagsEnum2(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.ReadOriginalValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2, 4),
+                CompiledModelTestBase.AFlagsEnum (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2));
+            flagsEnum2.SetPropertyIndexes(
+                index: 4,
+                originalValueIndex: 4,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            flagsEnum2.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
+                    int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
+                    CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                    CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        int (CompiledModelTestBase.AFlagsEnum value) => ((int)value),
+                        CompiledModelTestBase.AFlagsEnum (int value) => ((CompiledModelTestBase.AFlagsEnum)value))));
+            flagsEnum2.SetSentinelFromProviderValue(0);
+
+            var principalBaseId = runtimeEntityType.AddProperty(
+                "PrincipalBaseId",
+                typeof(long?),
+                nullable: true);
+            principalBaseId.SetAccessors(
+                long? (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(5) ? entry.ReadStoreGeneratedValue<long?>(1) : (entry.FlaggedAsTemporary(5) && !(entry.ReadShadowValue<long?>(0).HasValue) ? entry.ReadTemporaryValue<long?>(1) : entry.ReadShadowValue<long?>(0))),
+                long? (IInternalEntry entry) => entry.ReadShadowValue<long?>(0),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(principalBaseId, 5),
+                long? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long?>(principalBaseId, 1));
+            principalBaseId.SetPropertyIndexes(
+                index: 5,
+                originalValueIndex: 5,
+                shadowIndex: 0,
+                relationshipIndex: 1,
+                storeGenerationIndex: 1);
+            principalBaseId.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            principalBaseId.SetCurrentValueComparer(new EntryCurrentValueComparer<long?>(principalBaseId));
+            principalBaseId.SetComparer(new NullableValueComparer<long>(principalBaseId.TypeMapping.Comparer));
+            principalBaseId.SetKeyComparer(new NullableValueComparer<long>(principalBaseId.TypeMapping.KeyComparer));
+
+            var principalDerivedId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedId",
+                typeof(long?),
+                nullable: true);
+            principalDerivedId.SetAccessors(
+                long? (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(6) ? entry.ReadStoreGeneratedValue<long?>(2) : (entry.FlaggedAsTemporary(6) && !(entry.ReadShadowValue<long?>(1).HasValue) ? entry.ReadTemporaryValue<long?>(2) : entry.ReadShadowValue<long?>(1))),
+                long? (IInternalEntry entry) => entry.ReadShadowValue<long?>(1),
+                long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(principalDerivedId, 6),
+                long? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long?>(principalDerivedId, 2));
+            principalDerivedId.SetPropertyIndexes(
+                index: 6,
+                originalValueIndex: 6,
+                shadowIndex: 1,
+                relationshipIndex: 2,
+                storeGenerationIndex: 2);
+            principalDerivedId.TypeMapping = JetLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    bool (long v1, long v2) => v1 == v2,
+                    int (long v) => ((object)v).GetHashCode(),
+                    long (long v) => v));
+            principalDerivedId.SetCurrentValueComparer(new EntryCurrentValueComparer<long?>(principalDerivedId));
+            principalDerivedId.SetComparer(new NullableValueComparer<long>(principalDerivedId.TypeMapping.Comparer));
+            principalDerivedId.SetKeyComparer(new NullableValueComparer<long>(principalDerivedId.TypeMapping.KeyComparer));
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.SetGetter(
+                IPAddress[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeArray(instance) == null);
+            refTypeArray.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IPAddress[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeArray(instance) = value;
+                    return instance;
+                });
+            refTypeArray.SetAccessors(
+                IPAddress[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IPAddress[] (IInternalEntry entry) => entry.ReadOriginalValue<IPAddress[]>(refTypeArray, 7),
+                IPAddress[] (IInternalEntry entry) => entry.GetCurrentValue<IPAddress[]>(refTypeArray));
+            refTypeArray.SetPropertyIndexes(
+                index: 7,
+                originalValueIndex: 7,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<IPAddress[], IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeArrayElementType = refTypeArray.SetElementType(typeof(IPAddress));
+            refTypeArrayElementType.TypeMapping = refTypeArray.TypeMapping.ElementTypeMapping;
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.SetGetter(
+                IEnumerable<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) == null);
+            refTypeEnumerable.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            refTypeEnumerable.SetAccessors(
+                IEnumerable<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<string> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<string>>(refTypeEnumerable, 8),
+                IEnumerable<string> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable));
+            refTypeEnumerable.SetPropertyIndexes(
+                index: 8,
+                originalValueIndex: 8,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeEnumerableElementType = refTypeEnumerable.SetElementType(typeof(string));
+            refTypeEnumerableElementType.TypeMapping = refTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.SetGetter(
+                IList<string> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeIList(instance) == null);
+            refTypeIList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<string> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeIList(instance) = value;
+                    return instance;
+                });
+            refTypeIList.SetAccessors(
+                IList<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<string> (IInternalEntry entry) => entry.ReadOriginalValue<IList<string>>(refTypeIList, 9),
+                IList<string> (IInternalEntry entry) => entry.GetCurrentValue<IList<string>>(refTypeIList));
+            refTypeIList.SetPropertyIndexes(
+                index: 9,
+                originalValueIndex: 9,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<string>, string>(new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(255)",
+                        size: 255)));
+            var refTypeIListElementType = refTypeIList.SetElementType(typeof(string));
+            refTypeIListElementType.TypeMapping = refTypeIList.TypeMapping.ElementTypeMapping;
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.SetGetter(
+                List<IPAddress> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.RefTypeList(instance) == null);
+            refTypeList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<IPAddress> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.RefTypeList(instance) = value;
+                    return instance;
+                });
+            refTypeList.SetAccessors(
+                List<IPAddress> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.RefTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<IPAddress> (IInternalEntry entry) => entry.ReadOriginalValue<List<IPAddress>>(refTypeList, 10),
+                List<IPAddress> (IInternalEntry entry) => entry.GetCurrentValue<List<IPAddress>>(refTypeList));
+            refTypeList.SetPropertyIndexes(
+                index: 10,
+                originalValueIndex: 10,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            refTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                keyComparer: new ListOfReferenceTypesComparer<List<IPAddress>, IPAddress>(new ValueComparer<IPAddress>(
+                    bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    int (IPAddress v) => ((object)v).GetHashCode(),
+                    IPAddress (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v))))),
+                jsonValueReaderWriter: new JsonCollectionOfReferencesReaderWriter<List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))),
+                elementMapping: JetStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        bool (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        int (IPAddress v) => ((object)v).GetHashCode(),
+                        IPAddress (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        bool (string v1, string v2) => v1 == v2,
+                        int (string v) => ((object)v).GetHashCode(),
+                        string (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        string (IPAddress v) => ((object)v).ToString(),
+                        IPAddress (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            string (IPAddress v) => ((object)v).ToString(),
+                            IPAddress (string v) => IPAddress.Parse(v)))));
+            var refTypeListElementType = refTypeList.SetElementType(typeof(IPAddress));
+            refTypeListElementType.TypeMapping = refTypeList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.SetGetter(
+                DateTime[] (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) == null);
+            valueTypeArray.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, DateTime[] value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeArray(instance) = value;
+                    return instance;
+                });
+            valueTypeArray.SetAccessors(
+                DateTime[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeArray(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                DateTime[] (IInternalEntry entry) => entry.ReadOriginalValue<DateTime[]>(valueTypeArray, 11),
+                DateTime[] (IInternalEntry entry) => entry.GetCurrentValue<DateTime[]>(valueTypeArray));
+            valueTypeArray.SetPropertyIndexes(
+                index: 11,
+                originalValueIndex: 11,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeArray.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                keyComparer: new ListOfValueTypesComparer<DateTime[], DateTime>(new ValueComparer<DateTime>(
+                    bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    int (DateTime v) => ((object)v).GetHashCode(),
+                    DateTime (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: JetDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        bool (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        int (DateTime v) => ((object)v).GetHashCode(),
+                        DateTime (DateTime v) => v)));
+            var valueTypeArrayElementType = valueTypeArray.SetElementType(typeof(DateTime));
+            valueTypeArrayElementType.TypeMapping = valueTypeArray.TypeMapping.ElementTypeMapping;
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.SetGetter(
+                IEnumerable<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) == null);
+            valueTypeEnumerable.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IEnumerable<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(instance) = value;
+                    return instance;
+                });
+            valueTypeEnumerable.SetAccessors(
+                IEnumerable<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeEnumerable(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IEnumerable<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IEnumerable<byte>>(valueTypeEnumerable, 12),
+                IEnumerable<byte> (IInternalEntry entry) => entry.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable));
+            valueTypeEnumerable.SetPropertyIndexes(
+                index: 12,
+                originalValueIndex: 12,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeEnumerable.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeEnumerableElementType = valueTypeEnumerable.SetElementType(typeof(byte));
+            valueTypeEnumerableElementType.TypeMapping = valueTypeEnumerable.TypeMapping.ElementTypeMapping;
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.SetGetter(
+                IList<byte> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) == null);
+            valueTypeIList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, IList<byte> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeIList(instance) = value;
+                    return instance;
+                });
+            valueTypeIList.SetAccessors(
+                IList<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeIList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                IList<byte> (IInternalEntry entry) => entry.ReadOriginalValue<IList<byte>>(valueTypeIList, 13),
+                IList<byte> (IInternalEntry entry) => entry.GetCurrentValue<IList<byte>>(valueTypeIList));
+            valueTypeIList.SetPropertyIndexes(
+                index: 13,
+                originalValueIndex: 13,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeIList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<byte>, byte>(new ValueComparer<byte>(
+                    bool (byte v1, byte v2) => v1 == v2,
+                    int (byte v) => ((int)v),
+                    byte (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: JetByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        bool (byte v1, byte v2) => v1 == v2,
+                        int (byte v) => ((int)v),
+                        byte (byte v) => v)));
+            var valueTypeIListElementType = valueTypeIList.SetElementType(typeof(byte));
+            valueTypeIListElementType.TypeMapping = valueTypeIList.TypeMapping.ElementTypeMapping;
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.SetGetter(
+                List<short> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.ValueTypeList(instance) == null);
+            valueTypeList.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, List<short> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.ValueTypeList(instance) = value;
+                    return instance;
+                });
+            valueTypeList.SetAccessors(
+                List<short> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<short> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.ValueTypeList(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                List<short> (IInternalEntry entry) => entry.ReadOriginalValue<List<short>>(valueTypeList, 14),
+                List<short> (IInternalEntry entry) => entry.GetCurrentValue<List<short>>(valueTypeList));
+            valueTypeList.SetPropertyIndexes(
+                index: 14,
+                originalValueIndex: 14,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            valueTypeList.TypeMapping = JetStringTypeMapping.Default.Clone(
+                comparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                keyComparer: new ListOfValueTypesComparer<List<short>, short>(new ValueComparer<short>(
+                    bool (short v1, short v2) => v1 == v2,
+                    int (short v) => ((int)v),
+                    short (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    bool (string v1, string v2) => v1 == v2,
+                    int (string v) => ((object)v).GetHashCode(),
+                    string (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(255)",
+                    size: 255),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                jsonValueReaderWriter: new JsonCollectionOfStructsReaderWriter<List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: ShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        bool (short v1, short v2) => v1 == v2,
+                        int (short v) => ((int)v),
+                        short (short v) => v)));
+            var valueTypeListElementType = valueTypeList.SetElementType(typeof(short));
+            valueTypeListElementType.TypeMapping = valueTypeList.TypeMapping.ElementTypeMapping;
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalDerivedId });
+
+            var principalIndex = runtimeEntityType.AddIndex(
+                new[] { principalBaseId },
+                name: "PrincipalIndex",
+                unique: true);
+            principalIndex.AddAnnotation("Relational:Filter", "AlternateId <> NULL");
+            principalIndex.AddAnnotation("Relational:Name", "PIX");
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deriveds = principalEntityType.AddNavigation("Deriveds",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Deriveds", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Deriveds>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            deriveds.SetGetter(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Deriveds(instance),
+                bool (CompiledModelTestBase.PrincipalBase instance) => PrincipalBaseUnsafeAccessors.Deriveds(instance) == null);
+            deriveds.SetSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Deriveds(instance) = value;
+                    return instance;
+                });
+            deriveds.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalBase (CompiledModelTestBase.PrincipalBase instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalBaseUnsafeAccessors.Deriveds(instance) = value;
+                    return instance;
+                });
+            deriveds.SetAccessors(
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Deriveds(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalBaseUnsafeAccessors.Deriveds(((CompiledModelTestBase.PrincipalBase)(entry.Entity))),
+                null,
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => entry.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds));
+            deriveds.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 3,
+                storeGenerationIndex: -1);
+            deriveds.SetCollectionAccessor<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase entity) => PrincipalBaseUnsafeAccessors.Deriveds(entity),
+                (CompiledModelTestBase.PrincipalBase entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalBaseUnsafeAccessors.Deriveds(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                (CompiledModelTestBase.PrincipalBase entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalBaseUnsafeAccessors.Deriveds(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalBase entity, Action<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>> setter) => ClrCollectionAccessorFactory.CreateAndSetHashSet<CompiledModelTestBase.PrincipalBase, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(entity, setter),
+                ICollection<CompiledModelTestBase.PrincipalBase> () => ((ICollection<CompiledModelTestBase.PrincipalBase>)(((ICollection<CompiledModelTestBase.PrincipalBase>)(new HashSet<CompiledModelTestBase.PrincipalBase>(ReferenceEqualityComparer.Instance))))));
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalDerivedId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var principals = principalEntityType.AddNavigation("Principals",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Principals", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Principals>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            principals.SetGetter(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance),
+                bool (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance) == null);
+            principals.SetSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance) = value;
+                    return instance;
+                });
+            principals.SetMaterializationSetter(
+                CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> instance, ICollection<CompiledModelTestBase.PrincipalBase> value) =>
+                {
+                    PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(instance) = value;
+                    return instance;
+                });
+            principals.SetAccessors(
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
+                null,
+                ICollection<CompiledModelTestBase.PrincipalBase> (IInternalEntry entry) => entry.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(principals));
+            principals.SetPropertyIndexes(
+                index: 2,
+                originalValueIndex: -1,
+                shadowIndex: -1,
+                relationshipIndex: 5,
+                storeGenerationIndex: -1);
+            principals.SetCollectionAccessor<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(entity),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, ICollection<CompiledModelTestBase.PrincipalBase> collection) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Principals(entity) = ((ICollection<CompiledModelTestBase.PrincipalBase>)collection),
+                ICollection<CompiledModelTestBase.PrincipalBase> (CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> entity, Action<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, ICollection<CompiledModelTestBase.PrincipalBase>> setter) => ClrCollectionAccessorFactory.CreateAndSetHashSet<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>, ICollection<CompiledModelTestBase.PrincipalBase>, CompiledModelTestBase.PrincipalBase>(entity, setter),
+                ICollection<CompiledModelTestBase.PrincipalBase> () => ((ICollection<CompiledModelTestBase.PrincipalBase>)(((ICollection<CompiledModelTestBase.PrincipalBase>)(new HashSet<CompiledModelTestBase.PrincipalBase>(ReferenceEqualityComparer.Instance))))));
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var enum1 = runtimeEntityType.FindProperty("Enum1");
+            var enum2 = runtimeEntityType.FindProperty("Enum2");
+            var flagsEnum1 = runtimeEntityType.FindProperty("FlagsEnum1");
+            var flagsEnum2 = runtimeEntityType.FindProperty("FlagsEnum2");
+            var principalBaseId = runtimeEntityType.FindProperty("PrincipalBaseId");
+            var principalDerivedId = runtimeEntityType.FindProperty("PrincipalDerivedId");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNullableFactory<long?, long>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<long?>(key));
+            var deriveds = runtimeEntityType.FindNavigation("Deriveds");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.PrincipalBase)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum, CompiledModelTestBase.AFlagsEnum, long?, long?, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1)), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2)), (source.GetCurrentValue<long?>(principalBaseId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalBaseId))), (source.GetCurrentValue<long?>(principalDerivedId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalDerivedId).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalDerivedId))), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<CompiledModelTestBase.AnEnum, long?, long?>(((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(default(CompiledModelTestBase.AnEnum)), (default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(default(long? ))), (default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)principalDerivedId).GetValueComparer())).Snapshot(default(long? )))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<CompiledModelTestBase.AnEnum, long?, long?>(default(CompiledModelTestBase.AnEnum), default(long? ), default(long? )))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long?, long?>((source.ContainsKey("PrincipalBaseId") ? ((long? )(source["PrincipalBaseId"])) : null), (source.ContainsKey("PrincipalDerivedId") ? ((long? )(source["PrincipalDerivedId"])) : null)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long?, long?>(default(long? ), default(long? )))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.PrincipalBase)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, long?, long?, object>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), (source.GetCurrentValue<long?>(principalBaseId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalBaseId))), (source.GetCurrentValue<long?>(principalDerivedId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalDerivedId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalDerivedId))), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 15,
+                navigationCount: 1,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 15,
+                shadowCount: 2,
+                relationshipCount: 4,
+                storeGeneratedCount: 3));
+            var insertSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Insert",
+                "TPC",
+                false);
+
+            var id0 = insertSproc.AddParameter(
+                "Id", System.Data.ParameterDirection.Input, false, "Id", false);
+            var principalBaseId0 = insertSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var principalDerivedId0 = insertSproc.AddParameter(
+                "PrincipalDerivedId", System.Data.ParameterDirection.Input, false, "PrincipalDerivedId", false);
+            var enum20 = insertSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum10 = insertSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum20 = insertSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList0 = insertSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList0 = insertSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray0 = insertSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable0 = insertSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList0 = insertSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList0 = insertSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray0 = insertSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable0 = insertSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var enum10 = insertSproc.AddParameter(
+                "BaseEnum", System.Data.ParameterDirection.Output, false, "Enum1", false);
+            enum10.AddAnnotation("foo", "bar");
+            insertSproc.AddAnnotation("foo", "bar1");
+            runtimeEntityType.AddAnnotation("Relational:InsertStoredProcedure", insertSproc);
+
+            var deleteSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Delete",
+                "TPC",
+                false);
+
+            var id1 = deleteSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            var rowsAffected = deleteSproc.AddParameter(
+                "RowsAffected", System.Data.ParameterDirection.Output, true, null, null);
+            runtimeEntityType.AddAnnotation("Relational:DeleteStoredProcedure", deleteSproc);
+
+            var updateSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Update",
+                "TPC",
+                false);
+
+            var principalBaseId1 = updateSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var principalDerivedId1 = updateSproc.AddParameter(
+                "PrincipalDerivedId", System.Data.ParameterDirection.Input, false, "PrincipalDerivedId", false);
+            var enum11 = updateSproc.AddParameter(
+                "Enum1", System.Data.ParameterDirection.Input, false, "Enum1", false);
+            var enum21 = updateSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum11 = updateSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum21 = updateSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList1 = updateSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList1 = updateSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray1 = updateSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable1 = updateSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList1 = updateSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList1 = updateSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray1 = updateSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable1 = updateSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var id2 = updateSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:UpdateStoredProcedure", updateSproc);
+
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPC");
+            runtimeEntityType.AddAnnotation("Relational:Schema", "TPC");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewDefinitionSql", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", "PrincipalBaseView");
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", "TPC");
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalBaseUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalBaseUnsafeAccessors.cs
new file mode 100644
index 00000000..5495088c
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalBaseUnsafeAccessors.cs
@@ -0,0 +1,57 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class PrincipalBaseUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Id>k__BackingField")]
+        public static extern ref long? Id(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum1>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AnEnum Enum1(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Enum2>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AnEnum? Enum2(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<FlagsEnum1>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AFlagsEnum FlagsEnum1(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<FlagsEnum2>k__BackingField")]
+        public static extern ref CompiledModelTestBase.AFlagsEnum FlagsEnum2(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeArray>k__BackingField")]
+        public static extern ref IPAddress[] RefTypeArray(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeEnumerable>k__BackingField")]
+        public static extern ref IEnumerable<string> RefTypeEnumerable(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeIList>k__BackingField")]
+        public static extern ref IList<string> RefTypeIList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<RefTypeList>k__BackingField")]
+        public static extern ref List<IPAddress> RefTypeList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeArray>k__BackingField")]
+        public static extern ref DateTime[] ValueTypeArray(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeEnumerable>k__BackingField")]
+        public static extern ref IEnumerable<byte> ValueTypeEnumerable(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeIList>k__BackingField")]
+        public static extern ref IList<byte> ValueTypeIList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<ValueTypeList>k__BackingField")]
+        public static extern ref List<short> ValueTypeList(CompiledModelTestBase.PrincipalBase @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Deriveds>k__BackingField")]
+        public static extern ref ICollection<CompiledModelTestBase.PrincipalBase> Deriveds(CompiledModelTestBase.PrincipalBase @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalDerivedEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalDerivedEntityType.cs
new file mode 100644
index 00000000..260d0089
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalDerivedEntityType.cs
@@ -0,0 +1,183 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class PrincipalDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                baseEntityType,
+                discriminatorValue: "PrincipalDerived<DependentBase<byte?>>",
+                propertyCount: 0,
+                navigationCount: 2);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var enum1 = runtimeEntityType.FindProperty("Enum1");
+            var enum2 = runtimeEntityType.FindProperty("Enum2");
+            var flagsEnum1 = runtimeEntityType.FindProperty("FlagsEnum1");
+            var flagsEnum2 = runtimeEntityType.FindProperty("FlagsEnum2");
+            var principalBaseId = runtimeEntityType.FindProperty("PrincipalBaseId");
+            var principalDerivedId = runtimeEntityType.FindProperty("PrincipalDerivedId");
+            var refTypeArray = runtimeEntityType.FindProperty("RefTypeArray");
+            var refTypeEnumerable = runtimeEntityType.FindProperty("RefTypeEnumerable");
+            var refTypeIList = runtimeEntityType.FindProperty("RefTypeIList");
+            var refTypeList = runtimeEntityType.FindProperty("RefTypeList");
+            var valueTypeArray = runtimeEntityType.FindProperty("ValueTypeArray");
+            var valueTypeEnumerable = runtimeEntityType.FindProperty("ValueTypeEnumerable");
+            var valueTypeIList = runtimeEntityType.FindProperty("ValueTypeIList");
+            var valueTypeList = runtimeEntityType.FindProperty("ValueTypeList");
+            var deriveds = runtimeEntityType.FindNavigation("Deriveds");
+            var dependent = runtimeEntityType.FindNavigation("Dependent");
+            var principals = runtimeEntityType.FindNavigation("Principals");
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, CompiledModelTestBase.AnEnum, CompiledModelTestBase.AnEnum?, CompiledModelTestBase.AFlagsEnum, CompiledModelTestBase.AFlagsEnum, long?, long?, IPAddress[], IEnumerable<string>, IList<string>, List<IPAddress>, DateTime[], IEnumerable<byte>, IList<byte>, List<short>>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), ((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum>(enum1)), (source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2) == null ? null : ((ValueComparer<CompiledModelTestBase.AnEnum?>)(((IProperty)enum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AnEnum?>(enum2))), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum1).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum1)), ((ValueComparer<CompiledModelTestBase.AFlagsEnum>)(((IProperty)flagsEnum2).GetValueComparer())).Snapshot(source.GetCurrentValue<CompiledModelTestBase.AFlagsEnum>(flagsEnum2)), (source.GetCurrentValue<long?>(principalBaseId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalBaseId))), (source.GetCurrentValue<long?>(principalDerivedId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalDerivedId).GetValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalDerivedId))), (((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))) == null ? null : ((IPAddress[])(((ValueComparer<object>)(((IProperty)refTypeArray).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IPAddress[]>(refTypeArray))))))), (((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))) == null ? null : ((IEnumerable<string>)(((ValueComparer<object>)(((IProperty)refTypeEnumerable).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IEnumerable<string>>(refTypeEnumerable))))))), (((object)(source.GetCurrentValue<IList<string>>(refTypeIList))) == null ? null : ((IList<string>)(((ValueComparer<object>)(((IProperty)refTypeIList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<IList<string>>(refTypeIList))))))), (((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))) == null ? null : ((List<IPAddress>)(((ValueComparer<object>)(((IProperty)refTypeList).GetValueComparer())).Snapshot(((object)(source.GetCurrentValue<List<IPAddress>>(refTypeList))))))), (((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))) == null ? null : ((DateTime[])(((ValueComparer<IEnumerable<DateTime>>)(((IProperty)valueTypeArray).GetValueComparer())).Snapshot(((IEnumerable<DateTime>)(source.GetCurrentValue<DateTime[]>(valueTypeArray))))))), (source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable) == null ? null : ((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeEnumerable).GetValueComparer())).Snapshot(source.GetCurrentValue<IEnumerable<byte>>(valueTypeEnumerable))), (((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))) == null ? null : ((IList<byte>)(((ValueComparer<IEnumerable<byte>>)(((IProperty)valueTypeIList).GetValueComparer())).Snapshot(((IEnumerable<byte>)(source.GetCurrentValue<IList<byte>>(valueTypeIList))))))), (((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))) == null ? null : ((List<short>)(((ValueComparer<IEnumerable<short>>)(((IProperty)valueTypeList).GetValueComparer())).Snapshot(((IEnumerable<short>)(source.GetCurrentValue<List<short>>(valueTypeList))))))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<CompiledModelTestBase.AnEnum, long?, long?>(((ValueComparer<CompiledModelTestBase.AnEnum>)(((IProperty)enum1).GetValueComparer())).Snapshot(default(CompiledModelTestBase.AnEnum)), (default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetValueComparer())).Snapshot(default(long? ))), (default(long? ) == null ? null : ((ValueComparer<long?>)(((IProperty)principalDerivedId).GetValueComparer())).Snapshot(default(long? )))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<CompiledModelTestBase.AnEnum, long?, long?>(default(CompiledModelTestBase.AnEnum), default(long? ), default(long? )))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<long?, long?>((source.ContainsKey("PrincipalBaseId") ? ((long? )(source["PrincipalBaseId"])) : null), (source.ContainsKey("PrincipalDerivedId") ? ((long? )(source["PrincipalDerivedId"])) : null)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<long?, long?>(default(long? ), default(long? )))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<long?, long?, long?, object, object, object>((source.GetCurrentValue<long?>(id) == null ? null : ((ValueComparer<long?>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(id))), (source.GetCurrentValue<long?>(principalBaseId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalBaseId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalBaseId))), (source.GetCurrentValue<long?>(principalDerivedId) == null ? null : ((ValueComparer<long?>)(((IProperty)principalDerivedId).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<long?>(principalDerivedId))), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(deriveds)), source.GetCurrentValue<CompiledModelTestBase.DependentBase<byte?>>(dependent), SnapshotFactoryFactory.SnapshotCollection(source.GetCurrentValue<ICollection<CompiledModelTestBase.PrincipalBase>>(principals)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 15,
+                navigationCount: 3,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 15,
+                shadowCount: 2,
+                relationshipCount: 6,
+                storeGeneratedCount: 3));
+            var insertSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "Derived_Insert",
+                "TPC",
+                false);
+
+            var id0 = insertSproc.AddParameter(
+                "Id", System.Data.ParameterDirection.Input, false, "Id", false);
+            var principalBaseId0 = insertSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var principalDerivedId0 = insertSproc.AddParameter(
+                "PrincipalDerivedId", System.Data.ParameterDirection.Input, false, "PrincipalDerivedId", false);
+            var enum20 = insertSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum10 = insertSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum20 = insertSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList0 = insertSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList0 = insertSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray0 = insertSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable0 = insertSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList0 = insertSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList0 = insertSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray0 = insertSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable0 = insertSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var derivedEnum = insertSproc.AddResultColumn(
+                "DerivedEnum", false, "Enum1");
+            derivedEnum.AddAnnotation("foo", "bar3");
+            runtimeEntityType.AddAnnotation("Relational:InsertStoredProcedure", insertSproc);
+
+            var deleteSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "Derived_Delete",
+                "TPC",
+                false);
+
+            var id1 = deleteSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:DeleteStoredProcedure", deleteSproc);
+
+            var updateSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "Derived_Update",
+                "Derived",
+                false);
+
+            var principalBaseId1 = updateSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var principalDerivedId1 = updateSproc.AddParameter(
+                "PrincipalDerivedId", System.Data.ParameterDirection.Input, false, "PrincipalDerivedId", false);
+            var enum10 = updateSproc.AddParameter(
+                "Enum1", System.Data.ParameterDirection.Input, false, "Enum1", false);
+            var enum21 = updateSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum11 = updateSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum21 = updateSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList1 = updateSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList1 = updateSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray1 = updateSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable1 = updateSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList1 = updateSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList1 = updateSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray1 = updateSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable1 = updateSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var id2 = updateSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:UpdateStoredProcedure", updateSproc);
+
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", "TPC");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalDerived");
+            runtimeEntityType.AddAnnotation("Relational:ViewDefinitionSql", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", "PrincipalDerivedView");
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", "TPC");
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalDerivedUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalDerivedUnsafeAccessors.cs
new file mode 100644
index 00000000..33c6bf49
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalDerivedUnsafeAccessors.cs
@@ -0,0 +1,20 @@
+// <auto-generated />
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class PrincipalDerivedUnsafeAccessors<TDependent>
+        where TDependent : class
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Dependent>k__BackingField")]
+        public static extern ref TDependent Dependent(CompiledModelTestBase.PrincipalDerived<TDependent> @this);
+
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Principals>k__BackingField")]
+        public static extern ref ICollection<CompiledModelTestBase.PrincipalBase> Principals(CompiledModelTestBase.PrincipalDerived<TDependent> @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DataEntityType.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DataEntityType.cs
new file mode 100644
index 00000000..6cd00280
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DataEntityType.cs
@@ -0,0 +1,178 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Storage.Internal;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [EntityFrameworkInternal]
+    public partial class DataEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                typeof(CompiledModelTestBase.Data),
+                baseEntityType,
+                propertyCount: 2,
+                keyCount: 1,
+                triggerCount: 2);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.SetAccessors(
+                int (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<int>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<int>(0) == 0 ? entry.ReadTemporaryValue<int>(0) : entry.ReadShadowValue<int>(0))),
+                int (IInternalEntry entry) => entry.ReadShadowValue<int>(0),
+                int (IInternalEntry entry) => entry.ReadOriginalValue<int>(id, 0),
+                int (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<int>(id, 0));
+            id.SetPropertyIndexes(
+                index: 0,
+                originalValueIndex: 0,
+                shadowIndex: 0,
+                relationshipIndex: 0,
+                storeGenerationIndex: 0);
+            id.TypeMapping = JetIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    bool (int v1, int v2) => v1 == v2,
+                    int (int v) => v,
+                    int (int v) => v));
+            id.SetCurrentValueComparer(new EntryCurrentValueComparer<int>(id));
+            id.AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+
+            var blob = runtimeEntityType.AddProperty(
+                "Blob",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.Data).GetProperty("Blob", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.Data).GetField("<Blob>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            blob.SetGetter(
+                byte[] (CompiledModelTestBase.Data instance) => DataUnsafeAccessors.Blob(instance),
+                bool (CompiledModelTestBase.Data instance) => DataUnsafeAccessors.Blob(instance) == null);
+            blob.SetSetter(
+                CompiledModelTestBase.Data (CompiledModelTestBase.Data instance, byte[] value) =>
+                {
+                    DataUnsafeAccessors.Blob(instance) = value;
+                    return instance;
+                });
+            blob.SetMaterializationSetter(
+                CompiledModelTestBase.Data (CompiledModelTestBase.Data instance, byte[] value) =>
+                {
+                    DataUnsafeAccessors.Blob(instance) = value;
+                    return instance;
+                });
+            blob.SetAccessors(
+                byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
+                byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
+                byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(blob, 1),
+                byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(blob));
+            blob.SetPropertyIndexes(
+                index: 1,
+                originalValueIndex: 1,
+                shadowIndex: -1,
+                relationshipIndex: -1,
+                storeGenerationIndex: -1);
+            blob.TypeMapping = JetByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => ((object)v).GetHashCode(),
+                    byte[] (byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
+                    int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
+                    byte[] (byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longbinary"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var trigger1 = runtimeEntityType.AddTrigger(
+                "Trigger1");
+
+            var trigger2 = runtimeEntityType.AddTrigger(
+                "Trigger2");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var id = runtimeEntityType.FindProperty("Id");
+            var blob = runtimeEntityType.FindProperty("Blob");
+            var key = runtimeEntityType.FindKey(new[] { id });
+            key.SetPrincipalKeyValueFactory(KeyValueFactoryFactory.CreateSimpleNonNullableFactory<int>(key));
+            key.SetIdentityMapFactory(IdentityMapFactoryFactory.CreateFactory<int>(key));
+            runtimeEntityType.SetOriginalValuesFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.Data)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<int, byte[]>(((ValueComparer<int>)(((IProperty)id).GetValueComparer())).Snapshot(source.GetCurrentValue<int>(id)), (source.GetCurrentValue<byte[]>(blob) == null ? null : ((ValueComparer<byte[]>)(((IProperty)blob).GetValueComparer())).Snapshot(source.GetCurrentValue<byte[]>(blob))))));
+                });
+            runtimeEntityType.SetStoreGeneratedValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<int>(((ValueComparer<int>)(((IProperty)id).GetValueComparer())).Snapshot(default(int))))));
+            runtimeEntityType.SetTemporaryValuesFactory(
+                ISnapshot (IInternalEntry source) => ((ISnapshot)(new Snapshot<int>(default(int)))));
+            runtimeEntityType.SetShadowValuesFactory(
+                ISnapshot (IDictionary<string, object> source) => ((ISnapshot)(new Snapshot<int>((source.ContainsKey("Id") ? ((int)(source["Id"])) : 0)))));
+            runtimeEntityType.SetEmptyShadowValuesFactory(
+                ISnapshot () => ((ISnapshot)(new Snapshot<int>(default(int)))));
+            runtimeEntityType.SetRelationshipSnapshotFactory(
+                ISnapshot (IInternalEntry source) =>
+                {
+                    var structuralType = ((CompiledModelTestBase.Data)(source.Entity));
+                    return ((ISnapshot)(new Snapshot<int>(((ValueComparer<int>)(((IProperty)id).GetKeyValueComparer())).Snapshot(source.GetCurrentValue<int>(id)))));
+                });
+            runtimeEntityType.SetCounts(new PropertyCounts(
+                propertyCount: 2,
+                navigationCount: 0,
+                complexPropertyCount: 0,
+                complexCollectionCount: 0,
+                originalValueCount: 2,
+                shadowCount: 1,
+                relationshipCount: 1,
+                storeGeneratedCount: 1));
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Data");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DataUnsafeAccessors.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DataUnsafeAccessors.cs
new file mode 100644
index 00000000..193c8970
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DataUnsafeAccessors.cs
@@ -0,0 +1,16 @@
+// <auto-generated />
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public static class DataUnsafeAccessors
+    {
+        [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "<Blob>k__BackingField")]
+        public static extern ref byte[] Blob(CompiledModelTestBase.Data @this);
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextAssemblyAttributes.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextAssemblyAttributes.cs
new file mode 100644
index 00000000..c224873f
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextAssemblyAttributes.cs
@@ -0,0 +1,9 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TestNamespace;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(DbContext), typeof(DbContextModel))]
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModel.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModel.cs
new file mode 100644
index 00000000..583ee4d9
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModelBuilder.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModelBuilder.cs
new file mode 100644
index 00000000..a2601451
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModelBuilder.cs
@@ -0,0 +1,90 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using EntityFrameworkCore.Jet.Metadata;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Update.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 1)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var data = DataEntityType.Create(this);
+
+            DataEntityType.CreateAnnotations(data);
+
+            AddAnnotation("Jet:ValueGenerationStrategy", JetValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModelFactory", () => CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var data = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            data.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", null, relationalModel);
+            var blobColumnBase = new ColumnBase<ColumnMappingBase>("Blob", "longbinary", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Blob", blobColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "integer", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Id", idColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase = new TableMappingBase<ColumnMappingBase>(data, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, data.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)blobColumnBase, data.FindProperty("Blob")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            data.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dataTable = new Table("Data", null, relationalModel);
+            var idColumn = new Column("Id", "integer", dataTable);
+            dataTable.Columns.Add("Id", idColumn);
+            idColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<int>(idColumn);
+            idColumn.AddAnnotation("Jet:Identity", "1, 1");
+            var blobColumn = new Column("Blob", "longbinary", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("Blob", blobColumn);
+            blobColumn.Accessors = ColumnAccessorsFactory.CreateGeneric<byte[]>(blobColumn);
+            relationalModel.Tables.Add(("Data", null), dataTable);
+            var dataTableMapping = new TableMapping(data, dataTable, null);
+            dataTable.AddTypeMapping(dataTableMapping, false);
+            tableMappings.Add(dataTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, data.FindProperty("Id")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(blobColumn, data.FindProperty("Blob")!, dataTableMapping);
+            var pK_Data = new UniqueConstraint("PK_Data", dataTable, new[] { idColumn });
+            dataTable.PrimaryKey = pK_Data;
+            pK_Data.SetRowKeyValueFactory(new SimpleRowKeyValueFactory<int>(pK_Data));
+            var pK_DataKey = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                new[] { "Id" });
+            pK_Data.MappedKeys.Add(pK_DataKey);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DataKey).Add(pK_Data);
+            dataTable.UniqueConstraints.Add("PK_Data", pK_Data);
+            dataTable.Triggers.Add("Trigger1", data.FindDeclaredTrigger("Trigger1"));
+            dataTable.Triggers.Add("Trigger2", data.FindDeclaredTrigger("Trigger2"));
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/CompiledModelJetTest.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/CompiledModelJetTest.cs
new file mode 100644
index 00000000..4d9ae58c
--- /dev/null
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/CompiledModelJetTest.cs
@@ -0,0 +1,250 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// ReSharper disable InconsistentNaming
+
+using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
+using EntityFrameworkCore.Jet.Infrastructure;
+using EntityFrameworkCore.Jet.Metadata;
+using EntityFrameworkCore.Jet.Metadata.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Metadata;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using Microsoft.Extensions.DependencyInjection;
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace EntityFrameworkCore.Jet.FunctionalTests.Scaffolding;
+
+public class CompiledModelJetTest(NonSharedFixture fixture) : CompiledModelRelationalTestBase(fixture)
+{
+    protected override void BuildBigModel(ModelBuilder modelBuilder, bool jsonColumns)
+    {
+        base.BuildBigModel(modelBuilder, jsonColumns);
+
+        modelBuilder
+            .UseJetIdentityColumns(3, 2);
+
+        modelBuilder.Entity<PrincipalBase>(eb =>
+        {
+            if (!jsonColumns)
+            {
+                eb.Property(e => e.Id).HasConversion<int>().UseJetIdentityColumn(2, 3).ValueGeneratedOnAdd();
+            }
+            else
+            {
+                // long? maps to decimal(20,0) in Jet — no identity support; mark explicitly so the
+                // compiled model carries the annotation (convention can't infer it without converter).
+                eb.Property(e => e.Id).HasAnnotation(JetAnnotationNames.ValueGenerationStrategy, JetValueGenerationStrategy.None);
+            }
+
+            eb.HasKey(e => new { e.Id, e.AlternateId });
+
+            eb.OwnsOne(
+                e => e.Owned, ob =>
+                {
+                    ob.Property(e => e.Details);
+
+                    if (!jsonColumns)
+                    {
+                        ob.ToTable(
+                            "PrincipalBase", "mySchema",
+                            t => t.Property("PrincipalBaseId").UseJetIdentityColumn(2, 3));
+                    }
+                });
+        });
+
+        modelBuilder.Entity<PrincipalDerived<DependentBase<byte?>>>(eb =>
+        {
+            eb.HasMany(e => e.Principals).WithMany(e => (ICollection<PrincipalDerived<DependentBase<byte?>>>)e.Deriveds)
+                .UsingEntity(jb =>
+                {
+                });
+        });
+
+        modelBuilder.Entity<ManyTypes>(eb =>
+        {
+            eb.Property(m => m.CharToStringConverterProperty)
+                .IsFixedLength();
+        });
+    }
+
+    protected override void AssertBigModel(IModel model, bool jsonColumns)
+    {
+        base.AssertBigModel(model, jsonColumns);
+        /*Assert.Equal(
+            [RelationalAnnotationNames.MaxIdentifierLength, JetAnnotationNames.ValueGenerationStrategy],
+            model.GetAnnotations().Select(a => a.Name));*/
+        Assert.Equal(JetValueGenerationStrategy.IdentityColumn, model.GetValueGenerationStrategy());
+        Assert.Equal(
+            CoreStrings.RuntimeModelMissingData,
+            Assert.Throws<InvalidOperationException>(() => model.GetPropertyAccessMode()).Message);
+        Assert.Equal(model[JetAnnotationNames.IdentitySeed], 3);
+        Assert.Equal(model[JetAnnotationNames.IdentityIncrement], 2);
+
+        var principalBase = model.FindEntityType(typeof(PrincipalBase))!;
+        var principalId = principalBase.FindProperty(nameof(PrincipalBase.Id))!;
+        // Without HasConversion<int>() (JSON columns path), Id is a long which maps to decimal(20,0) in Jet
+        Assert.Equal(jsonColumns ? "decimal(20,0)" : "integer", principalId.GetColumnType());
+        if (jsonColumns)
+        {
+            Assert.Equal(
+                [JetAnnotationNames.ValueGenerationStrategy],
+                principalId.GetAnnotations().Select(a => a.Name));
+            Assert.Equal(JetValueGenerationStrategy.None, principalId.GetValueGenerationStrategy());
+        }
+        else
+        {
+            /*Assert.Equal(
+                [RelationalAnnotationNames.RelationalOverrides, JetAnnotationNames.ValueGenerationStrategy],
+                principalId.GetAnnotations().Select(a => a.Name));*/
+            Assert.Equal(JetValueGenerationStrategy.IdentityColumn, principalId.GetValueGenerationStrategy());
+        }
+
+        Assert.Equal(model[JetAnnotationNames.IdentitySeed], 3);
+        Assert.Equal(model[JetAnnotationNames.IdentityIncrement], 2);
+
+        var principalKey = principalBase.GetKeys().Last();
+
+        var referenceOwnedNavigation = principalBase.GetNavigations().Single();
+        var referenceOwnedType = referenceOwnedNavigation.TargetEntityType;
+
+        var principalTable = StoreObjectIdentifier.Create(referenceOwnedType, StoreObjectType.Table)!.Value;
+        if (jsonColumns)
+        {
+            Assert.Equal(
+                JetValueGenerationStrategy.None,
+                principalId.GetValueGenerationStrategy(principalTable));
+        }
+        else
+        {
+            Assert.Equal(
+                JetValueGenerationStrategy.IdentityColumn,
+                principalId.GetValueGenerationStrategy(principalTable));
+        }
+
+        var detailsProperty = referenceOwnedType.FindProperty(nameof(OwnedType.Details))!;
+
+        var principalDerived = model.FindEntityType(typeof(PrincipalDerived<DependentBase<byte?>>))!;
+        var ownedCollectionNavigation = principalDerived.GetDeclaredNavigations().Last();
+        var collectionOwnedType = ownedCollectionNavigation.TargetEntityType;
+
+        var derivedSkipNavigation = principalDerived.GetDeclaredSkipNavigations().Single();
+        var joinType = derivedSkipNavigation.JoinEntityType;
+
+        var rowid = joinType.GetProperties().Single(p => !p.IsForeignKey());
+        Assert.Equal("varbinary(8)", rowid.GetColumnType());
+        Assert.Equal(JetValueGenerationStrategy.None, rowid.GetValueGenerationStrategy());
+
+        var manyTypesType = model.FindEntityType(typeof(ManyTypes))!;
+        var stringProperty = manyTypesType.FindProperty(nameof(ManyTypes.String))!;
+        Assert.True(stringProperty.FindRelationalTypeMapping()!.IsUnicode);
+        Assert.False(stringProperty.FindRelationalTypeMapping()!.IsFixedLength);
+        var charToStringConverterProperty = manyTypesType.FindProperty(nameof(ManyTypes.CharToStringConverterProperty))!;
+        Assert.True(charToStringConverterProperty.FindRelationalTypeMapping()!.IsUnicode);
+        Assert.True(charToStringConverterProperty.FindRelationalTypeMapping()!.IsFixedLength);
+
+        var dependentNavigation = principalDerived.GetDeclaredNavigations().First();
+        var dependentBase = dependentNavigation.TargetEntityType;
+        var dependentDerived = dependentBase.GetDerivedTypes().Single();
+
+        var dependentData = dependentDerived.GetDeclaredProperties().First();
+        Assert.Equal("char(20)", dependentData.GetColumnType());
+
+        var dependentMoney = dependentDerived.GetDeclaredProperties().Last();
+        Assert.Equal("decimal(9,3)", dependentMoney.GetColumnType());
+        Assert.Equal(
+            [
+                dependentBase,
+                dependentDerived,
+                manyTypesType,
+                principalBase,
+                referenceOwnedType,
+                principalDerived,
+                collectionOwnedType,
+                joinType
+            ],
+            model.GetEntityTypes());
+    }
+
+    protected override void BuildComplexTypesModel(ModelBuilder modelBuilder)
+    {
+        base.BuildComplexTypesModel(modelBuilder);
+
+        modelBuilder.Entity<PrincipalBase>(eb =>
+        {
+            eb.ComplexProperty(
+                e => e.Owned, eb =>
+                {
+                    eb.Ignore(c => c.Context);
+
+                    eb.Property(c => c.Details);
+                });
+        });
+    }
+
+    protected override void AssertComplexTypes(IModel model)
+    {
+        base.AssertComplexTypes(model);
+
+        var principalBase = model.FindEntityType(typeof(PrincipalBase))!;
+        var complexProperty = principalBase.GetComplexProperties().Single();
+        var complexType = complexProperty.ComplexType;
+        var detailsProperty = complexType.FindProperty(nameof(OwnedType.Details))!;
+        // "Jet:..." (J=74) sorts before "MaxLength" (M=77) in the compiled model's ordinal annotation order.
+        Assert.Equal(
+            [
+                JetAnnotationNames.ValueGenerationStrategy,
+                CoreAnnotationNames.MaxLength,
+                CoreAnnotationNames.Precision,
+                RelationalAnnotationNames.ColumnName,
+                RelationalAnnotationNames.ColumnType,
+                CoreAnnotationNames.Scale,
+                CoreAnnotationNames.Unicode,
+                "foo"
+            ],
+            detailsProperty.GetAnnotations().Select(a => a.Name));
+
+        var dbFunction = model.FindDbFunction("PrincipalBaseTvf")!;
+        //Assert.Equal("dbo", dbFunction.Schema);
+
+        Assert.Equal(JetValueGenerationStrategy.None, detailsProperty.GetValueGenerationStrategy());
+        Assert.Equal(
+            CoreStrings.RuntimeModelMissingData,
+            Assert.Throws<InvalidOperationException>(() => detailsProperty.GetJetIdentitySeed()).Message);
+        Assert.Equal(
+            CoreStrings.RuntimeModelMissingData,
+            Assert.Throws<InvalidOperationException>(() => detailsProperty.GetJetIdentityIncrement()).Message);
+    }
+    
+    protected override TestHelpers TestHelpers
+        => JetTestHelpers.Instance;
+
+    protected override ITestStoreFactory TestStoreFactory
+        => JetTestStoreFactory.Instance;
+
+    protected override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
+    {
+        builder = base.AddOptions(builder)
+            .ConfigureWarnings(w => w.Ignore(JetEventId.DecimalTypeDefaultWarning));
+        new JetDbContextOptionsBuilder(builder);
+        return builder;
+    }
+
+    protected override BuildSource AddReferences(BuildSource build, [CallerFilePath] string filePath = "")
+    {
+        base.AddReferences(build);
+        build.References.Add(BuildReference.ByName("EntityFrameworkCore.Jet"));
+        return build;
+    }
+}
diff --git a/test/EFCore.Jet.FunctionalTests/Scaffolding/JetDatabaseModelFactoryTest.cs b/test/EFCore.Jet.FunctionalTests/Scaffolding/JetDatabaseModelFactoryTest.cs
index 7b7e1027..06f1c37f 100644
--- a/test/EFCore.Jet.FunctionalTests/Scaffolding/JetDatabaseModelFactoryTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Scaffolding/JetDatabaseModelFactoryTest.cs
@@ -2074,36 +2074,6 @@ CONSTRAINT MYFK FOREIGN KEY (ForeignKeyId) REFERENCES PrincipalTable(Id) ON DELE
                     DROP TABLE PrincipalTable;
                     """);
 
-        [ConditionalFact]
-        public void Skip_reflexive_foreign_key()
-            => Test(
-                """
-                    
-                    CREATE TABLE PrincipalTable (
-                    	Id int PRIMARY KEY,
-                    	CONSTRAINT MYFK FOREIGN KEY (Id) REFERENCES PrincipalTable(Id)
-                    );
-                    """,
-                [],
-                [],
-                dbModel =>
-                {
-                    var level = Fixture.OperationReporter.Messages
-                        .Single(
-                            m => m.Message
-                                 == JetResources.LogReflexiveConstraintIgnored(new TestLogger<JetLoggingDefinitions>())
-                                     .GenerateMessage("MYFK", "dbo.PrincipalTable")).Level;
-
-                    Assert.Equal(LogLevel.Debug, level);
-
-                    var table = Assert.Single(dbModel.Tables);
-                    Assert.Empty(table.ForeignKeys);
-                },
-                """
-                    
-                    DROP TABLE PrincipalTable;
-                    """);
-
         /*[ConditionalFact]
         public void Skip_duplicate_foreign_key()
             => Test(
diff --git a/test/EFCore.Jet.FunctionalTests/StoreGeneratedSqlServerTestBase.cs b/test/EFCore.Jet.FunctionalTests/StoreGeneratedSqlServerTestBase.cs
index 6d165fbf..1f9ce113 100644
--- a/test/EFCore.Jet.FunctionalTests/StoreGeneratedSqlServerTestBase.cs
+++ b/test/EFCore.Jet.FunctionalTests/StoreGeneratedSqlServerTestBase.cs
@@ -467,15 +467,6 @@ public abstract class StoreGeneratedJetFixtureBase : StoreGeneratedFixtureBase
         public virtual long LongToDecimalPrincipalSentinel
             => default;
 
-        public virtual WrappedIntHiLoKeyClass? WrappedIntHiLoKeyClassSentinel
-            => default;
-
-        public virtual WrappedIntHiLoKeyStruct WrappedIntHiLoKeyStructSentinel
-            => default;
-
-        public virtual WrappedIntHiLoKeyRecord? WrappedIntHiLoKeyRecordSentinel
-            => default;
-
         protected override ITestStoreFactory TestStoreFactory
             => JetTestStoreFactory.Instance;
 
diff --git a/test/EFCore.Jet.FunctionalTests/Update/JetUpdateSqlGeneratorTest.cs b/test/EFCore.Jet.FunctionalTests/Update/JetUpdateSqlGeneratorTest.cs
index f77d59a3..9be16a13 100644
--- a/test/EFCore.Jet.FunctionalTests/Update/JetUpdateSqlGeneratorTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Update/JetUpdateSqlGeneratorTest.cs
@@ -104,13 +104,17 @@ public void AppendBulkInsertOperation_appends_merge_if_store_generated_columns_e
 
         AssertBaseline(
 """
-MERGE [dbo].[Ducks] USING (
-VALUES (@p0, @p1, @p2, 0),
-(@p0, @p1, @p2, 1)) AS i ([Name], [Quacks], [ConcurrencyToken], _Position) ON 1=0
-WHEN NOT MATCHED THEN
-INSERT ([Name], [Quacks], [ConcurrencyToken])
-VALUES (i.[Name], i.[Quacks], i.[ConcurrencyToken])
-OUTPUT INSERTED.[Id], INSERTED.[Computed], i._Position;
+INSERT INTO `Ducks` (`Name`, `Quacks`, `ConcurrencyToken`)
+VALUES (@p0, @p1, @p2);
+SELECT `Id`, `Computed`
+FROM `Ducks`
+WHERE @@ROWCOUNT = 1 AND `Id` = @@identity;
+
+INSERT INTO `Ducks` (`Name`, `Quacks`, `ConcurrencyToken`)
+VALUES (@p0, @p1, @p2);
+SELECT `Id`, `Computed`
+FROM `Ducks`
+WHERE @@ROWCOUNT = 1 AND `Id` = @@identity;
 """,
             stringBuilder.ToString());
         Assert.Equal(ResultSetMapping.NotLastInResultSet | ResultSetMapping.IsPositionalResultMappingEnabled, grouping);
@@ -147,14 +151,17 @@ public void AppendBulkInsertOperation_appends_insert_if_store_generated_columns_
 
         AssertBaseline(
 """
-DECLARE @inserted0 TABLE ([Id] int);
-INSERT INTO [dbo].[Ducks] ([Id])
-OUTPUT INSERTED.[Id]
-INTO @inserted0
-VALUES (DEFAULT),
-(DEFAULT);
-SELECT [t].[Id], [t].[Computed] FROM [dbo].[Ducks] t
-INNER JOIN @inserted0 i ON ([t].[Id] = [i].[Id]);
+INSERT INTO `Ducks`
+DEFAULT VALUES;
+SELECT `Id`, `Computed`
+FROM `Ducks`
+WHERE @@ROWCOUNT = 1 AND `Id` = @@identity;
+
+INSERT INTO `Ducks`
+DEFAULT VALUES;
+SELECT `Id`, `Computed`
+FROM `Ducks`
+WHERE @@ROWCOUNT = 1 AND `Id` = @@identity;
 """,
             stringBuilder.ToString());
         Assert.Equal(ResultSetMapping.NotLastInResultSet, grouping);
@@ -248,10 +255,13 @@ protected override string Identity
         => throw new NotImplementedException();
 
     protected override string OpenDelimiter
-        => "[";
+        => "`";
 
     protected override string CloseDelimiter
-        => "]";
+        => "`";
+
+    protected override string Schema
+        => null!;
 
     private void AssertBaseline(string expected, string actual)
         => Assert.Equal(expected, actual.TrimEnd(), ignoreLineEndingDifferences: true);
diff --git a/test/EFCore.Jet.FunctionalTests/Update/MismatchedKeyTypesJetTest.cs b/test/EFCore.Jet.FunctionalTests/Update/MismatchedKeyTypesJetTest.cs
index 82b0a7b5..a8ab91a7 100644
--- a/test/EFCore.Jet.FunctionalTests/Update/MismatchedKeyTypesJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Update/MismatchedKeyTypesJetTest.cs
@@ -1,20 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Transactions;
 using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.ValueGeneration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace EntityFrameworkCore.Jet.FunctionalTests.Update;
@@ -24,84 +17,11 @@ public class MismatchedKeyTypesJetTest(MismatchedKeyTypesJetTest.MismatchedKeyTy
 {
     public MismatchedKeyTypesJetFixture Fixture { get; } = fixture;
 
-    [ConditionalFact] // Issue #28392
-    public virtual void Can_update_and_delete_with_bigint_FK_and_int_PK()
-    {
-        using var _ = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
-        using var context = new MismatchedKeyTypesContext(Fixture);
-
-        var principalEmpty = LoadAndValidateEmpty();
-        var principalPopulated = LoadAndValidatePopulated(2);
-
-        Assert.Equal(8, context.ChangeTracker.Entries().Count());
-
-        principalEmpty.OptionalSingle = new OptionalSingleIntLong();
-        principalEmpty.RequiredSingle = new RequiredSingleIntLong();
-        principalEmpty.OptionalMany.Add(new OptionalManyIntLong());
-        principalEmpty.RequiredMany.Add(new RequiredManyIntLong());
-
-        principalPopulated.OptionalSingle = null;
-        principalPopulated.RequiredSingle = null;
-        principalPopulated.OptionalMany.Clear();
-        principalPopulated.RequiredMany.Clear();
-
-        Assert.Equal(12, context.ChangeTracker.Entries().Count());
-
-        context.SaveChanges();
-
-        Assert.Equal(9, context.ChangeTracker.Entries().Count());
-
-        context.ChangeTracker.Clear();
-
-        LoadAndValidateEmpty();
-        LoadAndValidatePopulated(1);
-
-        Assert.Equal(6, context.ChangeTracker.Entries().Count());
-
-        Assert.Equal(2, context.Set<OptionalSingleIntLong>().ToList().Count);
-        Assert.Equal(1, context.Set<RequiredSingleIntLong>().ToList().Count);
-        Assert.Equal(3, context.Set<OptionalManyIntLong>().ToList().Count);
-        Assert.Equal(1, context.Set<RequiredManyIntLong>().ToList().Count);
-
-        Assert.Equal(9, context.ChangeTracker.Entries().Count());
-
-        PrincipalIntLong LoadAndValidateEmpty()
-        {
-            var loaded = Load().Single(e => e.OptionalSingle == null);
-
-            Assert.Null(loaded.OptionalSingle);
-            Assert.Null(loaded.RequiredSingle);
-            Assert.Empty(loaded.OptionalMany);
-            Assert.Empty(loaded.RequiredMany);
-
-            return loaded;
-        }
-
-        PrincipalIntLong LoadAndValidatePopulated(int expected)
-        {
-            var loaded = Load().Single(e => e.OptionalSingle != null);
-
-            Assert.NotNull(loaded.OptionalSingle);
-            Assert.NotNull(loaded.RequiredSingle);
-            Assert.Equal(expected, loaded.OptionalMany.Count);
-            Assert.Equal(expected, loaded.RequiredMany.Count);
-
-            return loaded;
-        }
-
-        IQueryable<PrincipalIntLong> Load()
-            => context.IntLongs
-                .Include(e => e.OptionalMany)
-                .Include(e => e.OptionalSingle)
-                .Include(e => e.RequiredMany)
-                .Include(e => e.RequiredSingle);
-    }
-
     [ConditionalFact] // Issue #28392
     public virtual void Can_update_and_delete_with_tinyint_FK_and_smallint_PK()
     {
-        using var _ = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
         using var context = new MismatchedKeyTypesContext(Fixture);
+        context.Database.BeginTransaction();
 
         var principalEmpty = LoadAndValidateEmpty();
         var principalPopulated = LoadAndValidatePopulated(2);
@@ -173,8 +93,8 @@ IQueryable<PrincipalShortByte> Load()
     [ConditionalFact] // Issue #28392
     public virtual void Can_update_and_delete_with_string_FK_and_GUID_PK()
     {
-        using var _ = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
         using var context = new MismatchedKeyTypesContext(Fixture);
+        context.Database.BeginTransaction();
 
         var principalEmpty = LoadAndValidateEmpty();
         var principalPopulated = LoadAndValidatePopulated(2);
@@ -246,8 +166,8 @@ IQueryable<PrincipalStringGuid> Load()
     [ConditionalFact] // Issue #28392
     public virtual void Can_update_and_delete_composite_keys_mismatched_in_store()
     {
-        using var _ = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
         using var context = new MismatchedKeyTypesContext(Fixture);
+        context.Database.BeginTransaction();
 
         var principalEmpty = LoadAndValidateEmpty();
         var principalPopulated = LoadAndValidatePopulated(2);
@@ -319,20 +239,16 @@ IQueryable<PrincipalComposite> Load()
     [ConditionalFact]
     public virtual void Queries_work_but_SaveChanges_fails_when_composite_keys_incompatible_in_store()
     {
-        using var _ = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
         using var context = new MismatchedKeyTypesContext(Fixture);
+        context.Database.BeginTransaction();
 
         context.Database.ExecuteSqlRaw(
-            """
-                INSERT INTO PrincipalBadComposite (Id1, Id2, Id3)
-                              VALUES (1, '833e6739-6ffb-4901-835c-b46d3f440c47', 1)
-                """);
+            @"INSERT INTO PrincipalBadComposite (Id1, Id2, Id3)
+              VALUES (1, '833e6739-6ffb-4901-835c-b46d3f440c47', 1)");
 
         context.Database.ExecuteSqlRaw(
-            """
-                INSERT INTO OptionalSingleBadComposite (Id, PrincipalId1, PrincipalId2, PrincipalId3)
-                              VALUES (1, 1, '833e6739-6ffb-4901-835c-b46d3f440c47', '4161c5b5-0b6c-4907-8534-2263737843a4')
-                """);
+            @"INSERT INTO OptionalSingleBadComposite (Id, PrincipalId1, PrincipalId2, PrincipalId3)
+              VALUES (1, 1, '833e6739-6ffb-4901-835c-b46d3f440c47', '4161c5b5-0b6c-4907-8534-2263737843a4')");
 
         var principal = context.Set<PrincipalBadComposite>().Single();
         var dependent = context.Set<OptionalSingleBadComposite>().Single();
@@ -344,27 +260,23 @@ INSERT INTO OptionalSingleBadComposite (Id, PrincipalId1, PrincipalId2, Principa
 
         Assert.Equal(
             RelationalStrings.StoredKeyTypesNotConvertable(
-                nameof(OptionalSingleBadComposite.PrincipalId3), "uniqueidentifier", "int", nameof(PrincipalBadComposite.Id3)),
+                nameof(OptionalSingleBadComposite.PrincipalId3), "uniqueidentifier", "integer", nameof(PrincipalBadComposite.Id3)),
             Assert.Throws<InvalidOperationException>(() => context.SaveChanges()).Message);
     }
 
     [ConditionalFact]
     public virtual void Queries_work_but_SaveChanges_fails_when_keys_incompatible_in_store()
     {
-        using var _ = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
         using var context = new MismatchedKeyTypesContext(Fixture);
+        context.Database.BeginTransaction();
 
         context.Database.ExecuteSqlRaw(
-            """
-                INSERT INTO PrincipalBad (Id)
-                              VALUES (1)
-                """);
+            @"INSERT INTO PrincipalBad (Id)
+              VALUES (1)");
 
         context.Database.ExecuteSqlRaw(
-            """
-                INSERT INTO OptionalSingleBad (Id, PrincipalId)
-                              VALUES (1, '4161c5b5-0b6c-4907-8534-2263737843a4')
-                """);
+            @"INSERT INTO OptionalSingleBad (Id, PrincipalId)
+              VALUES (1, '4161c5b5-0b6c-4907-8534-2263737843a4')");
 
         var principal = context.Set<PrincipalBad>().Single();
         var dependent = context.Set<OptionalSingleBad>().Single();
@@ -376,84 +288,64 @@ INSERT INTO OptionalSingleBad (Id, PrincipalId)
 
         Assert.Equal(
             RelationalStrings.StoredKeyTypesNotConvertable(
-                nameof(OptionalSingleBad.PrincipalId), "uniqueidentifier", "bigint", nameof(PrincipalBad.Id)),
-            Assert.Throws<TargetInvocationException>(() => context.SaveChanges()).InnerException!.InnerException!.Message);
+                nameof(OptionalSingleBad.PrincipalId), "uniqueidentifier", "decimal(20,0)", nameof(PrincipalBad.Id)),
+            Assert.Throws<InvalidOperationException>(() => context.SaveChanges()).Message);
     }
 
-    protected class MismatchedKeyTypesContextNoFks(MismatchedKeyTypesJetFixture fixture)
-        : MismatchedKeyTypesContext(fixture)
+    protected class MismatchedKeyTypesContextNoFks(MismatchedKeyTypesJetFixture fixture) : MismatchedKeyTypesContext(fixture)
     {
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-            modelBuilder.Entity<PrincipalIntLong>(
-                b =>
-                {
-                    b.Ignore(e => e.OptionalSingle);
-                    b.Ignore(e => e.RequiredSingle);
-                    b.Ignore(e => e.OptionalMany);
-                    b.Ignore(e => e.RequiredMany);
-                });
-
-            modelBuilder.Entity<OptionalSingleIntLong>().Ignore(e => e.Principal);
-            modelBuilder.Entity<RequiredSingleIntLong>().Ignore(e => e.Principal);
-            modelBuilder.Entity<OptionalManyIntLong>().Ignore(e => e.Principal);
-            modelBuilder.Entity<RequiredManyIntLong>().Ignore(e => e.Principal);
-
-            modelBuilder.Entity<PrincipalShortByte>(
-                b =>
-                {
-                    b.Ignore(e => e.OptionalSingle);
-                    b.Ignore(e => e.RequiredSingle);
-                    b.Ignore(e => e.OptionalMany);
-                    b.Ignore(e => e.RequiredMany);
-                });
+            modelBuilder.Entity<PrincipalShortByte>(b =>
+            {
+                b.Ignore(e => e.OptionalSingle);
+                b.Ignore(e => e.RequiredSingle);
+                b.Ignore(e => e.OptionalMany);
+                b.Ignore(e => e.RequiredMany);
+            });
 
             modelBuilder.Entity<OptionalSingleShortByte>().Ignore(e => e.Principal);
             modelBuilder.Entity<RequiredSingleShortByte>().Ignore(e => e.Principal);
             modelBuilder.Entity<OptionalManyShortByte>().Ignore(e => e.Principal);
             modelBuilder.Entity<RequiredManyShortByte>().Ignore(e => e.Principal);
 
-            modelBuilder.Entity<PrincipalStringGuid>(
-                b =>
-                {
-                    b.Ignore(e => e.OptionalSingle);
-                    b.Ignore(e => e.RequiredSingle);
-                    b.Ignore(e => e.OptionalMany);
-                    b.Ignore(e => e.RequiredMany);
-                });
+            modelBuilder.Entity<PrincipalStringGuid>(b =>
+            {
+                b.Ignore(e => e.OptionalSingle);
+                b.Ignore(e => e.RequiredSingle);
+                b.Ignore(e => e.OptionalMany);
+                b.Ignore(e => e.RequiredMany);
+            });
 
             modelBuilder.Entity<OptionalSingleStringGuid>().Ignore(e => e.Principal);
             modelBuilder.Entity<RequiredSingleStringGuid>().Ignore(e => e.Principal);
             modelBuilder.Entity<OptionalManyStringGuid>().Ignore(e => e.Principal);
             modelBuilder.Entity<RequiredManyStringGuid>().Ignore(e => e.Principal);
 
-            modelBuilder.Entity<PrincipalComposite>(
-                b =>
-                {
-                    b.Ignore(e => e.OptionalSingle);
-                    b.Ignore(e => e.RequiredSingle);
-                    b.Ignore(e => e.OptionalMany);
-                    b.Ignore(e => e.RequiredMany);
-                });
+            modelBuilder.Entity<PrincipalComposite>(b =>
+            {
+                b.Ignore(e => e.OptionalSingle);
+                b.Ignore(e => e.RequiredSingle);
+                b.Ignore(e => e.OptionalMany);
+                b.Ignore(e => e.RequiredMany);
+            });
 
             modelBuilder.Entity<OptionalSingleComposite>().Ignore(e => e.Principal);
             modelBuilder.Entity<RequiredSingleComposite>().Ignore(e => e.Principal);
             modelBuilder.Entity<OptionalManyComposite>().Ignore(e => e.Principal);
             modelBuilder.Entity<RequiredManyComposite>().Ignore(e => e.Principal);
 
-            modelBuilder.Entity<PrincipalBadComposite>(
-                b =>
-                {
-                    b.Ignore(e => e.OptionalSingle);
-                });
+            modelBuilder.Entity<PrincipalBadComposite>(b =>
+            {
+                b.Ignore(e => e.OptionalSingle);
+            });
 
             modelBuilder.Entity<OptionalSingleBadComposite>().Ignore(e => e.Principal);
 
-            modelBuilder.Entity<PrincipalBad>(
-                b =>
-                {
-                    b.Ignore(e => e.OptionalSingle);
-                });
+            modelBuilder.Entity<PrincipalBad>(b =>
+            {
+                b.Ignore(e => e.OptionalSingle);
+            });
 
             modelBuilder.Entity<OptionalSingleBad>().Ignore(e => e.Principal);
 
@@ -465,9 +357,6 @@ protected class MismatchedKeyTypesContext(MismatchedKeyTypesJetFixture fixture)
     {
         public MismatchedKeyTypesJetFixture Fixture { get; } = fixture;
 
-        public DbSet<PrincipalIntLong> IntLongs
-            => Set<PrincipalIntLong>();
-
         public DbSet<PrincipalShortByte> ShortBytes
             => Set<PrincipalShortByte>();
 
@@ -488,29 +377,23 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasValueGenerator<TemporaryByteValueGenerator>();
 
             modelBuilder.Entity<PrincipalComposite>()
-                .HasKey(
-                    e => new
-                    {
-                        e.Id1,
-                        e.Id2,
-                        e.Id3
-                    });
+                .HasKey(e => new
+                {
+                    e.Id1,
+                    e.Id2,
+                    e.Id3
+                });
 
             modelBuilder.Entity<PrincipalBadComposite>()
-                .HasKey(
-                    e => new
-                    {
-                        e.Id1,
-                        e.Id2,
-                        e.Id3
-                    });
+                .HasKey(e => new
+                {
+                    e.Id1,
+                    e.Id2,
+                    e.Id3
+                });
 
             modelBuilder.Entity<PrincipalBad>().Property(e => e.Id).ValueGeneratedNever();
 
-            modelBuilder.Entity<OptionalSingleIntLong>().Property(e => e.PrincipalId).HasColumnType("bigint");
-            modelBuilder.Entity<RequiredSingleIntLong>().Property(e => e.PrincipalId).HasColumnType("bigint");
-            modelBuilder.Entity<OptionalManyIntLong>().Property(e => e.PrincipalId).HasColumnType("bigint");
-            modelBuilder.Entity<RequiredManyIntLong>().Property(e => e.PrincipalId).HasColumnType("bigint");
             modelBuilder.Entity<OptionalSingleShortByte>().Property(e => e.PrincipalId).HasColumnType("tinyint");
             modelBuilder.Entity<RequiredSingleShortByte>().Property(e => e.PrincipalId).HasColumnType("tinyint");
             modelBuilder.Entity<OptionalManyShortByte>().Property(e => e.PrincipalId).HasColumnType("tinyint");
@@ -528,64 +411,20 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<OptionalManyComposite>().Property(e => e.PrincipalId2).HasColumnType("nvarchar(64)");
             modelBuilder.Entity<RequiredManyComposite>().Property(e => e.PrincipalId2).HasColumnType("nvarchar(64)");
 
-            modelBuilder.Entity<OptionalSingleBad>(
-                b =>
-                {
-                    b.Property(e => e.Id).ValueGeneratedNever();
-                    b.Property(e => e.PrincipalId).HasConversion(v => new Guid(), v => 1);
-                });
+            modelBuilder.Entity<OptionalSingleBad>(b =>
+            {
+                b.Property(e => e.Id).ValueGeneratedNever();
+                b.Property(e => e.PrincipalId).HasConversion(v => new Guid(), v => 1);
+            });
 
-            modelBuilder.Entity<OptionalSingleBadComposite>(
-                b =>
-                {
-                    b.Property(e => e.Id).ValueGeneratedNever();
-                    b.Property(e => e.PrincipalId3).HasConversion(v => new Guid(), v => 1);
-                });
+            modelBuilder.Entity<OptionalSingleBadComposite>(b =>
+            {
+                b.Property(e => e.Id).ValueGeneratedNever();
+                b.Property(e => e.PrincipalId3).HasConversion(v => new Guid(), v => 1);
+            });
         }
     }
 
-    protected class PrincipalIntLong
-    {
-        public int Id { get; set; }
-
-        public OptionalSingleIntLong? OptionalSingle { get; set; }
-        public RequiredSingleIntLong? RequiredSingle { get; set; }
-        public List<OptionalManyIntLong> OptionalMany { get; } = [];
-        public List<RequiredManyIntLong> RequiredMany { get; } = [];
-    }
-
-    protected class OptionalSingleIntLong
-    {
-        public long Id { get; set; }
-
-        public PrincipalIntLong? Principal { get; set; }
-        public int? PrincipalId { get; set; }
-    }
-
-    protected class RequiredSingleIntLong
-    {
-        public Guid Id { get; set; }
-
-        public PrincipalIntLong Principal { get; set; } = null!;
-        public int PrincipalId { get; set; }
-    }
-
-    protected class OptionalManyIntLong
-    {
-        public long Id { get; set; }
-
-        public PrincipalIntLong? Principal { get; set; }
-        public int? PrincipalId { get; set; }
-    }
-
-    protected class RequiredManyIntLong
-    {
-        public Guid Id { get; set; }
-
-        public PrincipalIntLong Principal { get; set; } = null!;
-        public int PrincipalId { get; set; }
-    }
-
     protected class PrincipalShortByte
     {
         public int Id { get; set; }
@@ -598,7 +437,7 @@ protected class PrincipalShortByte
 
     protected class OptionalSingleShortByte
     {
-        public long Id { get; set; }
+        public int Id { get; set; }
 
         public PrincipalShortByte? Principal { get; set; }
         public int? PrincipalId { get; set; }
@@ -614,7 +453,7 @@ protected class RequiredSingleShortByte
 
     protected class OptionalManyShortByte
     {
-        public long Id { get; set; }
+        public int Id { get; set; }
 
         public PrincipalShortByte? Principal { get; set; }
         public int? PrincipalId { get; set; }
@@ -763,14 +602,6 @@ public async Task SeedAsync()
             using var context = new MismatchedKeyTypesContext(this);
 
             context.AddRange(
-                new PrincipalIntLong
-                {
-                    OptionalSingle = new OptionalSingleIntLong(),
-                    RequiredSingle = new RequiredSingleIntLong(),
-                    OptionalMany = { new OptionalManyIntLong(), new OptionalManyIntLong() },
-                    RequiredMany = { new RequiredManyIntLong(), new RequiredManyIntLong() }
-                },
-                new PrincipalIntLong(),
                 new PrincipalShortByte
                 {
                     OptionalSingle = new OptionalSingleShortByte(),
diff --git a/test/EFCore.Jet.FunctionalTests/Update/StoredProcedureUpdateJetTest.cs b/test/EFCore.Jet.FunctionalTests/Update/StoredProcedureUpdateJetTest.cs
deleted file mode 100644
index 0efd082d..00000000
--- a/test/EFCore.Jet.FunctionalTests/Update/StoredProcedureUpdateJetTest.cs
+++ /dev/null
@@ -1,715 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using Microsoft.EntityFrameworkCore.Update;
-using System;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Update;
-
-public class StoredProcedureUpdateJetTest(NonSharedFixture fixture) : StoredProcedureUpdateTestBase(fixture)
-{
-    public override async Task Insert_with_output_parameter(bool async)
-    {
-        await base.Insert_with_output_parameter(
-            async,
-"""
-CREATE PROCEDURE Entity_Insert(@Name varchar(max), @Id int OUT)
-AS BEGIN
-    INSERT INTO [Entity] ([Name]) VALUES (@Name);
-    SET @Id = SCOPE_IDENTITY();
-END
-""");
-
-        AssertSql(
-"""
-@p0='New' (Size = 4000)
-@p1='1' (Direction = Output)
-
-SET NOCOUNT ON;
-EXEC [Entity_Insert] @p0, @p1 OUTPUT;
-""");
-    }
-
-    public override async Task Insert_twice_with_output_parameter(bool async)
-    {
-        await base.Insert_twice_with_output_parameter(
-            async,
-"""
-CREATE PROCEDURE Entity_Insert(@Name varchar(max), @Id int OUT)
-AS BEGIN
-    INSERT INTO [Entity] ([Name]) VALUES (@Name);
-    SET @Id = SCOPE_IDENTITY();
-END
-""");
-
-        AssertSql(
-"""
-@p0='New1' (Size = 4000)
-@p1='1' (Direction = Output)
-@p2='New2' (Size = 4000)
-@p3='2' (Direction = Output)
-
-SET NOCOUNT ON;
-EXEC [Entity_Insert] @p0, @p1 OUTPUT;
-EXEC [Entity_Insert] @p2, @p3 OUTPUT;
-""");
-    }
-
-    public override async Task Insert_with_result_column(bool async)
-    {
-        await base.Insert_with_result_column(
-            async,
-"""
-CREATE PROCEDURE Entity_Insert(@Name varchar(max))
-AS INSERT INTO [Entity] ([Name]) OUTPUT [Inserted].[Id] VALUES (@Name)
-""");
-
-        AssertSql(
-"""
-@p0='Foo' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC [Entity_Insert] @p0;
-""");
-    }
-
-    public override async Task Insert_with_two_result_columns(bool async)
-    {
-        await base.Insert_with_two_result_columns(
-            async,
-"""
-CREATE PROCEDURE EntityWithAdditionalProperty_Insert(@Name varchar(max))
-AS INSERT INTO [EntityWithAdditionalProperty] ([Name]) OUTPUT [Inserted].[AdditionalProperty], [Inserted].[Id] VALUES (@Name)
-""");
-
-        AssertSql(
-"""
-@p0='Foo' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC [EntityWithAdditionalProperty_Insert] @p0;
-""");
-    }
-
-    public override async Task Insert_with_output_parameter_and_result_column(bool async)
-    {
-        await base.Insert_with_output_parameter_and_result_column(
-            async,
-"""
-CREATE PROCEDURE EntityWithAdditionalProperty_Insert(@Id int OUT, @Name varchar(max))
-AS BEGIN
-    INSERT INTO [EntityWithAdditionalProperty] ([Name]) VALUES (@Name);
-    SET @Id = SCOPE_IDENTITY();
-    SELECT [AdditionalProperty] FROM [EntityWithAdditionalProperty] WHERE [Id] = @Id
-END
-""");
-
-        AssertSql(
-"""
-@p0=NULL (Nullable = false) (Direction = Output) (DbType = Int32)
-@p1='Foo' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC [EntityWithAdditionalProperty_Insert] @p0 OUTPUT, @p1;
-""");
-    }
-
-    public override async Task Update(bool async)
-    {
-        await base.Update(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @Name varchar(max))
-AS UPDATE [Entity] SET [Name] = @Name WHERE [Id] = @id
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Updated' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC [Entity_Update] @p0, @p1;
-""");
-    }
-
-    public override async Task Update_partial(bool async)
-    {
-        await base.Update_partial(
-            async,
-"""
-CREATE PROCEDURE EntityWithAdditionalProperty_Update(@Id int, @Name varchar(max), @AdditionalProperty int)
-AS UPDATE [EntityWithAdditionalProperty] SET [Name] = @Name, [AdditionalProperty] = @AdditionalProperty WHERE [Id] = @id
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Updated' (Size = 4000)
-@p2='8'
-
-SET NOCOUNT ON;
-EXEC [EntityWithAdditionalProperty_Update] @p0, @p1, @p2;
-""");
-    }
-
-    public override async Task Update_with_output_parameter_and_rows_affected_result_column(bool async)
-    {
-        await base.Update_with_output_parameter_and_rows_affected_result_column(
-            async,
-"""
-CREATE PROCEDURE EntityWithAdditionalProperty_Update(@Id int, @Name varchar(max), @AdditionalProperty int OUT)
-AS BEGIN
-    UPDATE [EntityWithAdditionalProperty] SET [Name] = @Name, @AdditionalProperty = [AdditionalProperty] WHERE [Id] = @Id;
-    SELECT @@ROWCOUNT;
-END
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Updated' (Size = 4000)
-@p2=NULL (Nullable = false) (Direction = Output) (DbType = Int32)
-
-SET NOCOUNT ON;
-EXEC [EntityWithAdditionalProperty_Update] @p0, @p1, @p2 OUTPUT;
-""");
-    }
-
-    public override async Task Update_with_output_parameter_and_rows_affected_result_column_concurrency_failure(bool async)
-    {
-        await base.Update_with_output_parameter_and_rows_affected_result_column_concurrency_failure(
-            async,
-"""
-CREATE PROCEDURE EntityWithAdditionalProperty_Update(@Id int, @Name varchar(max), @AdditionalProperty int OUT)
-AS BEGIN
-    UPDATE [EntityWithAdditionalProperty] SET [Name] = @Name, @AdditionalProperty = [AdditionalProperty] WHERE [Id] = @Id;
-    SELECT @@ROWCOUNT;
-END
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Updated' (Size = 4000)
-@p2=NULL (Nullable = false) (Direction = Output) (DbType = Int32)
-
-SET NOCOUNT ON;
-EXEC [EntityWithAdditionalProperty_Update] @p0, @p1, @p2 OUTPUT;
-""");
-    }
-
-    public override async Task Delete(bool async)
-    {
-        await base.Delete(
-            async,
-"""
-CREATE PROCEDURE Entity_Delete(@Id int)
-AS DELETE FROM [Entity] WHERE [Id] = @Id
-""");
-
-        AssertSql(
-            """
-@p0='1'
-
-EXEC `Entity_Delete` p0;
-""");
-    }
-
-    public override async Task Delete_and_insert(bool async)
-    {
-        await base.Delete_and_insert(
-            async,
-"""
-CREATE PROCEDURE Entity_Insert(@Name varchar(255), @Id int OUT)
-AS BEGIN
-    INSERT INTO [Entity] ([Name]) VALUES (@Name);
-    SET @Id = SCOPE_IDENTITY();
-END;
-
-GO;
-
-CREATE PROCEDURE Entity_Delete(@Id int)
-AS DELETE FROM [Entity] WHERE [Id] = @Id;
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Entity2' (Size = 4000)
-@p2='2' (Direction = Output)
-
-SET NOCOUNT ON;
-EXEC [Entity_Delete] @p0;
-EXEC [Entity_Insert] @p1, @p2 OUTPUT;
-""");
-    }
-
-    public override async Task Rows_affected_parameter(bool async)
-    {
-        await base.Rows_affected_parameter(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @Name varchar(max), @RowsAffected int OUT)
-AS BEGIN
-    UPDATE [Entity] SET [Name] = @Name WHERE [Id] = @Id;
-    SET @RowsAffected = @@ROWCOUNT;
-END
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Updated' (Size = 4000)
-@p2='1' (Direction = Output)
-
-SET NOCOUNT ON;
-EXEC [Entity_Update] @p0, @p1, @p2 OUTPUT;
-""");
-    }
-
-    public override async Task Rows_affected_parameter_and_concurrency_failure(bool async)
-    {
-        await base.Rows_affected_parameter_and_concurrency_failure(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @Name varchar(max), @RowsAffected int OUT)
-AS BEGIN
-    UPDATE [Entity] SET [Name] = @Name WHERE [Id] = @Id;
-    SET @RowsAffected = @@ROWCOUNT;
-END
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Updated' (Size = 4000)
-@p2='0' (Direction = Output)
-
-SET NOCOUNT ON;
-EXEC [Entity_Update] @p0, @p1, @p2 OUTPUT;
-""");
-    }
-
-    public override async Task Rows_affected_result_column(bool async)
-    {
-        await base.Rows_affected_result_column(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @Name varchar(max))
-AS BEGIN
-    UPDATE [Entity] SET [Name] = @Name WHERE [Id] = @Id;
-    SELECT @@ROWCOUNT;
-END
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Updated' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC [Entity_Update] @p0, @p1;
-""");
-    }
-
-    public override async Task Rows_affected_result_column_and_concurrency_failure(bool async)
-    {
-        await base.Rows_affected_result_column_and_concurrency_failure(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @Name varchar(max))
-AS BEGIN
-    UPDATE [Entity] SET [Name] = @Name WHERE [Id] = @Id;
-    SELECT @@ROWCOUNT;
-END
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Updated' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC [Entity_Update] @p0, @p1;
-""");
-    }
-
-    public override async Task Rows_affected_return_value(bool async)
-    {
-        await base.Rows_affected_return_value(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @Name varchar(max))
-AS BEGIN
-    UPDATE [Entity] SET [Name] = @Name WHERE [Id] = @Id;
-    RETURN @@ROWCOUNT;
-END
-""");
-
-        AssertSql(
-"""
-@p0='1' (Direction = Output)
-@p1='1'
-@p2='Updated' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC @p0 = [Entity_Update] @p1, @p2;
-""");
-    }
-
-    public override async Task Rows_affected_return_value_and_concurrency_failure(bool async)
-    {
-        await base.Rows_affected_return_value_and_concurrency_failure(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @Name varchar(max))
-AS BEGIN
-    UPDATE [Entity] SET [Name] = @Name WHERE [Id] = @Id;
-    RETURN @@ROWCOUNT;
-END
-""");
-
-        AssertSql(
-"""
-@p0='0' (Direction = Output)
-@p1='1'
-@p2='Updated' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC @p0 = [Entity_Update] @p1, @p2;
-""");
-    }
-
-    public override async Task Store_generated_concurrency_token_as_in_out_parameter(bool async)
-    {
-        await base.Store_generated_concurrency_token_as_in_out_parameter(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @ConcurrencyToken rowversion OUT, @Name varchar(max), @RowsAffected int OUT)
-AS BEGIN
-    UPDATE [Entity] SET [Name] = @Name WHERE [Id] = @Id AND [ConcurrencyToken] = @ConcurrencyToken;
-    SET @RowsAffected = @@ROWCOUNT;
-END
-""");
-
-        // Can't assert SQL baseline as usual because the concurrency token changes
-        Assert.Contains("(Size = 8) (Direction = InputOutput)", TestSqlLoggerFactory.Sql);
-
-        Assert.Equal(
-            """
-                @p2='Updated' (Size = 4000)
-                @p3='0' (Direction = Output)
-                
-                SET NOCOUNT ON;
-                EXEC [Entity_Update] @p0, @p1 OUTPUT, @p2, @p3 OUTPUT;
-                """,
-            TestSqlLoggerFactory.Sql[TestSqlLoggerFactory.Sql.IndexOf("@p2", StringComparison.Ordinal)..],
-            ignoreLineEndingDifferences: true);
-    }
-
-    public override async Task Store_generated_concurrency_token_as_two_parameters(bool async)
-    {
-        await base.Store_generated_concurrency_token_as_two_parameters(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @ConcurrencyTokenIn rowversion, @Name varchar(max), @ConcurrencyTokenOut rowversion OUT, @RowsAffected int OUT)
-AS BEGIN
-    UPDATE [Entity] SET [Name] = @Name, @ConcurrencyTokenOut = [ConcurrencyToken] WHERE [Id] = @Id AND [ConcurrencyToken] = @ConcurrencyTokenIn;
-    SET @RowsAffected = @@ROWCOUNT;
-END
-""");
-
-        // Can't assert SQL baseline as usual because the concurrency token changes
-        Assert.Equal(
-            """
-                @p2='Updated' (Size = 4000)
-                @p3=NULL (Size = 8) (Direction = Output) (DbType = Binary)
-                @p4='0' (Direction = Output)
-                
-                SET NOCOUNT ON;
-                EXEC [Entity_Update] @p0, @p1, @p2, @p3 OUTPUT, @p4 OUTPUT;
-                """,
-            TestSqlLoggerFactory.Sql[TestSqlLoggerFactory.Sql.IndexOf("@p2", StringComparison.Ordinal)..],
-            ignoreLineEndingDifferences: true);
-    }
-
-    public override async Task User_managed_concurrency_token(bool async)
-    {
-        await base.User_managed_concurrency_token(
-            async,
-"""
-CREATE PROCEDURE EntityWithAdditionalProperty_Update(@Id int, @ConcurrencyTokenOriginal int, @Name varchar(max), @ConcurrencyTokenCurrent int, @RowsAffected int OUT)
-AS BEGIN
-    UPDATE [EntityWithAdditionalProperty] SET [Name] = @Name, [AdditionalProperty] = @ConcurrencyTokenCurrent WHERE [Id] = @Id AND [AdditionalProperty] = @ConcurrencyTokenOriginal;
-    SET @RowsAffected = @@ROWCOUNT;
-END
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='8'
-@p2='Updated' (Size = 4000)
-@p3='9'
-@p4='0' (Direction = Output)
-
-SET NOCOUNT ON;
-EXEC [EntityWithAdditionalProperty_Update] @p0, @p1, @p2, @p3, @p4 OUTPUT;
-""");
-    }
-
-    public override async Task Original_and_current_value_on_non_concurrency_token(bool async)
-    {
-        await base.Original_and_current_value_on_non_concurrency_token(
-            async,
-"""
-CREATE PROCEDURE Entity_Update(@Id int, @NameCurrent varchar(max), @NameOriginal varchar(max))
-AS BEGIN
-    IF @NameCurrent <> @NameOriginal
-    BEGIN
-        UPDATE [Entity] SET [Name] = @NameCurrent WHERE [Id] = @Id;
-    END
-END
-""");
-
-        AssertSql(
-"""
-@p0='1'
-@p1='Updated' (Size = 4000)
-@p2='Initial' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC [Entity_Update] @p0, @p1, @p2;
-""");
-    }
-
-    public override async Task Input_or_output_parameter_with_input(bool async)
-    {
-        await base.Input_or_output_parameter_with_input(
-            async,
-"""
-CREATE PROCEDURE Entity_Insert(@Id int OUT, @Name varchar(max) OUT)
-AS BEGIN
-    IF @Name IS NULL
-    BEGIN
-        INSERT INTO [Entity] ([Name]) VALUES ('Some default value');
-        SET @Name = 'Some default value';
-    END
-    ELSE
-    BEGIN
-        INSERT INTO [Entity] ([Name]) VALUES (@Name);
-        SET @Name = NULL;
-    END
-
-    SET @Id = SCOPE_IDENTITY();
-END
-""");
-
-        AssertSql(
-"""
-@p0='1' (Direction = Output)
-@p1=NULL (Nullable = false) (Size = 4000) (Direction = InputOutput)
-
-SET NOCOUNT ON;
-EXEC [Entity_Insert] @p0 OUTPUT, @p1 OUTPUT;
-""");
-    }
-
-    public override async Task Input_or_output_parameter_with_output(bool async)
-    {
-        await base.Input_or_output_parameter_with_output(
-            async,
-"""
-CREATE PROCEDURE Entity_Insert(@Id int OUT, @Name varchar(max) OUT)
-AS BEGIN
-    IF @Name IS NULL
-    BEGIN
-        INSERT INTO [Entity] ([Name]) VALUES ('Some default value');
-        SET @Name = 'Some default value';
-    END
-    ELSE
-    BEGIN
-        INSERT INTO [Entity] ([Name]) VALUES (@Name);
-        SET @Name = NULL;
-    END
-
-    SET @Id = SCOPE_IDENTITY();
-END
-""");
-
-        AssertSql(
-"""
-@p0='1' (Direction = Output)
-@p1='Some default value' (Nullable = false) (Size = 4000) (Direction = InputOutput)
-
-SET NOCOUNT ON;
-EXEC [Entity_Insert] @p0 OUTPUT, @p1 OUTPUT;
-""");
-    }
-
-    public override async Task Tph(bool async)
-    {
-        await base.Tph(
-            async,
-"""
-CREATE PROCEDURE Tph_Insert(@Id int OUT, @Discriminator varchar(max), @Name varchar(max), @Child2InputProperty int, @Child2OutputParameterProperty int OUT, @Child1Property int)
-AS BEGIN
-    DECLARE @Table table ([Child2OutputParameterProperty] int);
-    INSERT INTO [Tph] ([Discriminator], [Name], [Child1Property], [Child2InputProperty]) OUTPUT [Inserted].[Child2OutputParameterProperty] INTO @Table VALUES (@Discriminator, @Name, @Child1Property, @Child2InputProperty);
-    SET @Id = SCOPE_IDENTITY();
-    SELECT @Child2OutputParameterProperty = [Child2OutputParameterProperty] FROM @Table;
-    SELECT [Child2ResultColumnProperty] FROM [Tph] WHERE [Id] = @Id
-END
-""");
-
-        AssertSql(
-"""
-@p0=NULL (Nullable = false) (Direction = Output) (DbType = Int32)
-@p1='Child1' (Nullable = false) (Size = 4000)
-@p2='Child' (Size = 4000)
-@p3=NULL (DbType = Int32)
-@p4=NULL (Direction = Output) (DbType = Int32)
-@p5='8' (Nullable = true)
-
-SET NOCOUNT ON;
-EXEC [Tph_Insert] @p0 OUTPUT, @p1, @p2, @p3, @p4 OUTPUT, @p5;
-""");
-    }
-
-    public override async Task Tpt(bool async)
-    {
-        await base.Tpt(
-            async,
-"""
-CREATE PROCEDURE Parent_Insert(@Id int OUT, @Name varchar(max))
-AS BEGIN
-    INSERT INTO [Parent] ([Name]) VALUES (@Name);
-    SET @Id = SCOPE_IDENTITY();
-END;
-
-GO
-
-CREATE PROCEDURE Child1_Insert(@Id int, @Child1Property int)
-AS BEGIN
-    INSERT INTO [Child1] ([Id], [Child1Property]) VALUES (@Id, @Child1Property);
-    SET @Id = SCOPE_IDENTITY();
-END;
-""");
-
-        AssertSql(
-"""
-@p0='1' (Direction = Output)
-@p1='Child' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC [Parent_Insert] @p0 OUTPUT, @p1;
-""",
-//
-"""
-@p2='1'
-@p3='8'
-
-SET NOCOUNT ON;
-EXEC [Child1_Insert] @p2, @p3;
-""");
-    }
-
-    public override async Task Tpt_mixed_sproc_and_non_sproc(bool async)
-    {
-        await base.Tpt_mixed_sproc_and_non_sproc(
-            async,
-"""
-CREATE PROCEDURE Parent_Insert(@Id int OUT, @Name varchar(max))
-AS BEGIN
-    INSERT INTO [Parent] ([Name]) VALUES (@Name);
-    SET @Id = SCOPE_IDENTITY();
-END
-""");
-
-        AssertSql(
-"""
-@p0='1' (Direction = Output)
-@p1='Child' (Size = 4000)
-
-SET NOCOUNT ON;
-EXEC [Parent_Insert] @p0 OUTPUT, @p1;
-""",
-//
-"""
-@p2='1'
-@p3='8'
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-INSERT INTO [Child1] ([Id], [Child1Property])
-VALUES (@p2, @p3);
-""");
-    }
-
-    public override async Task Tpc(bool async)
-    {
-        await base.Tpc(
-            async,
-"""
-CREATE PROCEDURE Child1_Insert(@Id int OUT, @Name varchar(max), @Child1Property int)
-AS BEGIN
-    DECLARE @Table table ([Id] int);
-    INSERT INTO [Child1] ([Name], [Child1Property]) OUTPUT [Inserted].[Id] INTO @Table VALUES (@Name, @Child1Property);
-    SELECT @Id = [Id] FROM @Table;
-END
-""");
-
-        AssertSql(
-"""
-@p0='1' (Direction = Output)
-@p1='Child' (Size = 4000)
-@p2='8'
-
-SET NOCOUNT ON;
-EXEC [Child1_Insert] @p0 OUTPUT, @p1, @p2;
-""");
-    }
-
-    public override async Task Non_sproc_followed_by_sproc_commands_in_the_same_batch(bool async)
-    {
-        await base.Non_sproc_followed_by_sproc_commands_in_the_same_batch(
-            async,
-"""
-CREATE PROCEDURE EntityWithAdditionalProperty_Insert(@Name varchar(max), @Id int OUT, @AdditionalProperty int)
-AS BEGIN
-    INSERT INTO [EntityWithAdditionalProperty] ([Name], [AdditionalProperty]) VALUES (@Name, @AdditionalProperty);
-    SET @Id = SCOPE_IDENTITY();
-END
-""");
-
-        AssertSql(
-"""
-@p2='1'
-@p0='2'
-@p3='1'
-@p1='Entity1_Modified' (Size = 4000)
-@p4='Entity2' (Size = 4000)
-@p5=NULL (Nullable = false) (Direction = Output) (DbType = Int32)
-@p6='0'
-
-SET NOCOUNT ON;
-UPDATE [EntityWithAdditionalProperty] SET [AdditionalProperty] = @p0, [Name] = @p1
-OUTPUT 1
-WHERE [Id] = @p2 AND [AdditionalProperty] = @p3;
-EXEC [EntityWithAdditionalProperty_Insert] @p4, @p5 OUTPUT, @p6;
-""");
-    }
-
-    protected override void ConfigureStoreGeneratedConcurrencyToken(EntityTypeBuilder entityTypeBuilder, string propertyName)
-        => entityTypeBuilder.Property<byte[]>(propertyName).IsRowVersion();
-
-    protected override ITestStoreFactory TestStoreFactory
-        => JetTestStoreFactory.Instance;
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTPCTest.cs b/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTPCTest.cs
deleted file mode 100644
index 18579e1c..00000000
--- a/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTPCTest.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore.TestModels.UpdatesModel;
-using Microsoft.EntityFrameworkCore.Update;
-using System.Threading.Tasks;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Update;
-
-public class UpdatesJetTPCTest(UpdatesJetTPCTest.UpdatesJetTPCFixture fixture, ITestOutputHelper testOutputHelper)
-    : UpdatesJetTestBase<UpdatesJetTPCTest.UpdatesJetTPCFixture>(fixture, testOutputHelper)
-{
-    public override async Task Save_with_shared_foreign_key()
-    {
-        await base.Save_with_shared_foreign_key();
-
-        AssertContainsSql(
-            @"@p0=NULL (Size = 8000) (DbType = Binary)
-@p1='ProductWithBytes' (Nullable = false) (Size = 21)
-@p2=NULL (Size = 4000)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-INSERT INTO [ProductBase] ([Bytes], [Discriminator], [ProductWithBytes_Name])
-OUTPUT INSERTED.[Id]
-VALUES (@p0, @p1, @p2);",
-            @"@p0=NULL (Size = 4000)
-@p1='777'
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-INSERT INTO [SpecialCategory] ([Name], [PrincipalId])
-OUTPUT INSERTED.[Id]
-VALUES (@p0, @p1);");
-    }
-
-    public override async Task Save_replaced_principal()
-    {
-        await base.Save_replaced_principal();
-
-        AssertSql(
-            """
-SELECT TOP(2) [u].[Id], [u].[Name], [u].[PrincipalId], [u].[Discriminator]
-FROM (
-    SELECT [c].[Id], [c].[Name], [c].[PrincipalId], N'Category' AS [Discriminator]
-    FROM [Categories] AS [c]
-    UNION ALL
-    SELECT [s].[Id], [s].[Name], [s].[PrincipalId], N'SpecialCategory' AS [Discriminator]
-    FROM [SpecialCategory] AS [s]
-) AS [u]
-""",
-            //
-            """
-@category_PrincipalId='778' (Nullable = true)
-
-SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
-FROM [ProductBase] AS [p]
-WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @category_PrincipalId
-""",
-            //
-            """
-@p1='1'
-@p0='New Category' (Size = 4000)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-UPDATE [Categories] SET [Name] = @p0
-OUTPUT 1
-WHERE [Id] = @p1;
-""",
-            //
-            """
-SELECT TOP(2) [u].[Id], [u].[Name], [u].[PrincipalId], [u].[Discriminator]
-FROM (
-    SELECT [c].[Id], [c].[Name], [c].[PrincipalId], N'Category' AS [Discriminator]
-    FROM [Categories] AS [c]
-    UNION ALL
-    SELECT [s].[Id], [s].[Name], [s].[PrincipalId], N'SpecialCategory' AS [Discriminator]
-    FROM [SpecialCategory] AS [s]
-) AS [u]
-""",
-            //
-            """
-@category_PrincipalId='778' (Nullable = true)
-
-SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
-FROM [ProductBase] AS [p]
-WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @category_PrincipalId
-""");
-    }
-
-    public class UpdatesJetTPCFixture : UpdatesJetFixtureBase
-    {
-        protected override string StoreName
-            => "UpdateTestTPC";
-
-        public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder).ConfigureWarnings(w =>
-            {
-                w.Log(RelationalEventId.ForeignKeyTpcPrincipalWarning);
-            });
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
-        {
-            base.OnModelCreating(modelBuilder, context);
-
-            modelBuilder.Entity<Category>().UseTpcMappingStrategy();
-            modelBuilder.Entity<GiftObscurer>().UseTpcMappingStrategy();
-            modelBuilder.Entity<LiftObscurer>().UseTpcMappingStrategy();
-            modelBuilder.Entity<Baked>().UseTpcMappingStrategy();
-        }
-    }
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTPTTest.cs b/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTPTTest.cs
deleted file mode 100644
index 977defc9..00000000
--- a/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTPTTest.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.TestModels.UpdatesModel;
-using Microsoft.EntityFrameworkCore.Update;
-using System.Threading.Tasks;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Update;
-
-public class UpdatesJetTPTTest(UpdatesJetTPTTest.UpdatesJetTPTFixture fixture, ITestOutputHelper testOutputHelper)
-    : UpdatesJetTestBase<UpdatesJetTPTTest.UpdatesJetTPTFixture>(fixture, testOutputHelper)
-{
-    public override async Task Save_with_shared_foreign_key()
-    {
-        await base.Save_with_shared_foreign_key();
-
-        AssertContainsSql(
-            @"@p0=NULL (Size = 8000) (DbType = Binary)
-@p1='ProductWithBytes' (Nullable = false) (Size = 21)
-@p2=NULL (Size = 4000)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-INSERT INTO [ProductBase] ([Bytes], [Discriminator], [ProductWithBytes_Name])
-OUTPUT INSERTED.[Id]
-VALUES (@p0, @p1, @p2);",
-            @"@p0=NULL (Size = 4000)
-@p1='777'
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-INSERT INTO [Categories] ([Name], [PrincipalId])
-OUTPUT INSERTED.[Id]
-VALUES (@p0, @p1);");
-    }
-
-    public override async Task Save_replaced_principal()
-    {
-        await base.Save_replaced_principal();
-
-        AssertSql(
-            """
-SELECT TOP(2) [c].[Id], [c].[Name], [c].[PrincipalId], CASE
-    WHEN [s].[Id] IS NOT NULL THEN N'SpecialCategory'
-END AS [Discriminator]
-FROM [Categories] AS [c]
-LEFT JOIN [SpecialCategory] AS [s] ON [c].[Id] = [s].[Id]
-""",
-            //
-            """
-@category_PrincipalId='778' (Nullable = true)
-
-SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
-FROM [ProductBase] AS [p]
-WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @category_PrincipalId
-""",
-            //
-            """
-@p1='1'
-@p0='New Category' (Size = 4000)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-UPDATE [Categories] SET [Name] = @p0
-OUTPUT 1
-WHERE [Id] = @p1;
-""",
-            //
-            """
-SELECT TOP(2) [c].[Id], [c].[Name], [c].[PrincipalId], CASE
-    WHEN [s].[Id] IS NOT NULL THEN N'SpecialCategory'
-END AS [Discriminator]
-FROM [Categories] AS [c]
-LEFT JOIN [SpecialCategory] AS [s] ON [c].[Id] = [s].[Id]
-""",
-            //
-            """
-@category_PrincipalId='778' (Nullable = true)
-
-SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
-FROM [ProductBase] AS [p]
-WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @category_PrincipalId
-""");
-    }
-
-    public class UpdatesJetTPTFixture : UpdatesJetFixtureBase
-    {
-        protected override string StoreName
-            => "UpdateTestTPT";
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
-        {
-            base.OnModelCreating(modelBuilder, context);
-
-            modelBuilder.Entity<Category>().UseTptMappingStrategy();
-            modelBuilder.Entity<GiftObscurer>().UseTptMappingStrategy();
-            modelBuilder.Entity<LiftObscurer>().UseTptMappingStrategy();
-            modelBuilder.Entity<Baked>().UseTptMappingStrategy();
-        }
-    }
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTest.cs b/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTest.cs
deleted file mode 100644
index 3def3ae0..00000000
--- a/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTest.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Microsoft.EntityFrameworkCore.Update;
-using System.Threading.Tasks;
-using Xunit.Abstractions;
-
-namespace EntityFrameworkCore.Jet.FunctionalTests.Update;
-
-public class UpdatesJetTest(UpdatesJetTest.UpdatesJetFixture fixture, ITestOutputHelper testOutputHelper)
-    : UpdatesJetTestBase<UpdatesJetTest.UpdatesJetFixture>(fixture, testOutputHelper)
-{
-    public override async Task Save_with_shared_foreign_key()
-    {
-        await base.Save_with_shared_foreign_key();
-
-        AssertContainsSql(
-            @"@p0=NULL (Size = 8000) (DbType = Binary)
-@p1='ProductWithBytes' (Nullable = false) (Size = 21)
-@p2=NULL (Size = 4000)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-INSERT INTO [ProductBase] ([Bytes], [Discriminator], [ProductWithBytes_Name])
-OUTPUT INSERTED.[Id]
-VALUES (@p0, @p1, @p2);",
-            @"@p0='SpecialCategory' (Nullable = false) (Size = 21)
-@p1=NULL (Size = 4000)
-@p2='777'
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-INSERT INTO [Categories] ([Discriminator], [Name], [PrincipalId])
-OUTPUT INSERTED.[Id]
-VALUES (@p0, @p1, @p2);");
-    }
-
-    public override async Task Save_replaced_principal()
-    {
-        await base.Save_replaced_principal();
-
-        AssertSql(
-            """
-SELECT TOP(2) [c].[Id], [c].[Discriminator], [c].[Name], [c].[PrincipalId]
-FROM [Categories] AS [c]
-""",
-            //
-            """
-@category_PrincipalId='778' (Nullable = true)
-
-SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
-FROM [ProductBase] AS [p]
-WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @category_PrincipalId
-""",
-            //
-            """
-@p1='1'
-@p0='New Category' (Size = 4000)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-UPDATE [Categories] SET [Name] = @p0
-OUTPUT 1
-WHERE [Id] = @p1;
-""",
-            //
-            """
-SELECT TOP(2) [c].[Id], [c].[Discriminator], [c].[Name], [c].[PrincipalId]
-FROM [Categories] AS [c]
-""",
-            //
-            """
-@category_PrincipalId='778' (Nullable = true)
-
-SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
-FROM [ProductBase] AS [p]
-WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @category_PrincipalId
-""");
-    }
-
-    public class UpdatesJetFixture : UpdatesJetFixtureBase
-    {
-        protected override string StoreName
-            => "UpdateTest";
-    }
-}
diff --git a/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTestBase.cs b/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTestBase.cs
deleted file mode 100644
index cf9e3b1f..00000000
--- a/test/EFCore.Jet.FunctionalTests/Update/UpdatesJetTestBase.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
-using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.TestModels.UpdatesModel;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Microsoft.EntityFrameworkCore.Update;
-
-public abstract class UpdatesJetTestBase<TFixture> : UpdatesRelationalTestBase<TFixture>
-    where TFixture : UpdatesJetTestBase<TFixture>.UpdatesJetFixtureBase
-{
-    protected UpdatesJetTestBase(TFixture fixture, ITestOutputHelper testOutputHelper)
-        : base(fixture)
-    {
-        Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
-        Fixture.TestSqlLoggerFactory.Clear();
-    }
-
-    public override async Task Can_add_and_remove_self_refs()
-    {
-        await Fixture.ResetIdentity();
-
-        await base.Can_add_and_remove_self_refs();
-
-        AssertSql(
-            """
-@p0=NULL (Size = 4000)
-@p1='1' (Nullable = false) (Size = 4000)
-@p2=NULL (DbType = Int32)
-@p3=NULL (DbType = Int32)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-INSERT INTO [Person] ([Country], [Name], [ParentId], [ZipCode])
-OUTPUT INSERTED.[PersonId]
-VALUES (@p0, @p1, @p2, @p3);
-""",
-            //
-            """
-@p4=NULL (Size = 4000)
-@p5='2' (Nullable = false) (Size = 4000)
-@p6='1' (Nullable = true)
-@p7=NULL (DbType = Int32)
-@p8=NULL (Size = 4000)
-@p9='3' (Nullable = false) (Size = 4000)
-@p10='1' (Nullable = true)
-@p11=NULL (DbType = Int32)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-MERGE [Person] USING (
-VALUES (@p4, @p5, @p6, @p7, 0),
-(@p8, @p9, @p10, @p11, 1)) AS i ([Country], [Name], [ParentId], [ZipCode], _Position) ON 1=0
-WHEN NOT MATCHED THEN
-INSERT ([Country], [Name], [ParentId], [ZipCode])
-VALUES (i.[Country], i.[Name], i.[ParentId], i.[ZipCode])
-OUTPUT INSERTED.[PersonId], i._Position;
-""",
-            //
-            """
-@p12=NULL (Size = 4000)
-@p13='4' (Nullable = false) (Size = 4000)
-@p14='2' (Nullable = true)
-@p15=NULL (DbType = Int32)
-@p16=NULL (Size = 4000)
-@p17='5' (Nullable = false) (Size = 4000)
-@p18='2' (Nullable = true)
-@p19=NULL (DbType = Int32)
-@p20=NULL (Size = 4000)
-@p21='6' (Nullable = false) (Size = 4000)
-@p22='3' (Nullable = true)
-@p23=NULL (DbType = Int32)
-@p24=NULL (Size = 4000)
-@p25='7' (Nullable = false) (Size = 4000)
-@p26='3' (Nullable = true)
-@p27=NULL (DbType = Int32)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-MERGE [Person] USING (
-VALUES (@p12, @p13, @p14, @p15, 0),
-(@p16, @p17, @p18, @p19, 1),
-(@p20, @p21, @p22, @p23, 2),
-(@p24, @p25, @p26, @p27, 3)) AS i ([Country], [Name], [ParentId], [ZipCode], _Position) ON 1=0
-WHEN NOT MATCHED THEN
-INSERT ([Country], [Name], [ParentId], [ZipCode])
-VALUES (i.[Country], i.[Name], i.[ParentId], i.[ZipCode])
-OUTPUT INSERTED.[PersonId], i._Position;
-""",
-            //
-            """
-@p0='4'
-@p1='5'
-@p2='6'
-@p3='2'
-@p4='7'
-@p5='3'
-@p6=NULL (Size = 4000)
-@p7='1' (Nullable = false) (Size = 4000)
-@p8=NULL (DbType = Int32)
-@p9=NULL (DbType = Int32)
-
-SET NOCOUNT ON;
-DELETE FROM [Person]
-OUTPUT 1
-WHERE [PersonId] = @p0;
-DELETE FROM [Person]
-OUTPUT 1
-WHERE [PersonId] = @p1;
-DELETE FROM [Person]
-OUTPUT 1
-WHERE [PersonId] = @p2;
-DELETE FROM [Person]
-OUTPUT 1
-WHERE [PersonId] = @p3;
-DELETE FROM [Person]
-OUTPUT 1
-WHERE [PersonId] = @p4;
-DELETE FROM [Person]
-OUTPUT 1
-WHERE [PersonId] = @p5;
-INSERT INTO [Person] ([Country], [Name], [ParentId], [ZipCode])
-OUTPUT INSERTED.[PersonId]
-VALUES (@p6, @p7, @p8, @p9);
-""",
-            //
-            """
-@p10='1'
-@p11=NULL (Size = 4000)
-@p12='2' (Nullable = false) (Size = 4000)
-@p13='8' (Nullable = true)
-@p14=NULL (DbType = Int32)
-@p15=NULL (Size = 4000)
-@p16='3' (Nullable = false) (Size = 4000)
-@p17='8' (Nullable = true)
-@p18=NULL (DbType = Int32)
-
-SET NOCOUNT ON;
-DELETE FROM [Person]
-OUTPUT 1
-WHERE [PersonId] = @p10;
-MERGE [Person] USING (
-VALUES (@p11, @p12, @p13, @p14, 0),
-(@p15, @p16, @p17, @p18, 1)) AS i ([Country], [Name], [ParentId], [ZipCode], _Position) ON 1=0
-WHEN NOT MATCHED THEN
-INSERT ([Country], [Name], [ParentId], [ZipCode])
-VALUES (i.[Country], i.[Name], i.[ParentId], i.[ZipCode])
-OUTPUT INSERTED.[PersonId], i._Position;
-""",
-            //
-            """
-@p19=NULL (Size = 4000)
-@p20='4' (Nullable = false) (Size = 4000)
-@p21='9' (Nullable = true)
-@p22=NULL (DbType = Int32)
-@p23=NULL (Size = 4000)
-@p24='5' (Nullable = false) (Size = 4000)
-@p25='9' (Nullable = true)
-@p26=NULL (DbType = Int32)
-@p27=NULL (Size = 4000)
-@p28='6' (Nullable = false) (Size = 4000)
-@p29='10' (Nullable = true)
-@p30=NULL (DbType = Int32)
-@p31=NULL (Size = 4000)
-@p32='7' (Nullable = false) (Size = 4000)
-@p33='10' (Nullable = true)
-@p34=NULL (DbType = Int32)
-
-SET IMPLICIT_TRANSACTIONS OFF;
-SET NOCOUNT ON;
-MERGE [Person] USING (
-VALUES (@p19, @p20, @p21, @p22, 0),
-(@p23, @p24, @p25, @p26, 1),
-(@p27, @p28, @p29, @p30, 2),
-(@p31, @p32, @p33, @p34, 3)) AS i ([Country], [Name], [ParentId], [ZipCode], _Position) ON 1=0
-WHEN NOT MATCHED THEN
-INSERT ([Country], [Name], [ParentId], [ZipCode])
-VALUES (i.[Country], i.[Name], i.[ParentId], i.[ZipCode])
-OUTPUT INSERTED.[PersonId], i._Position;
-""",
-            //
-            """
-SELECT [p].[PersonId], [p].[Country], [p].[Name], [p].[ParentId], [p].[ZipCode], [p].[Address_City], [p].[Country], [p].[ZipCode], [p0].[PersonId], [p0].[Country], [p0].[Name], [p0].[ParentId], [p0].[ZipCode], [p0].[Address_City], [p0].[Country], [p0].[ZipCode], [p1].[PersonId], [p1].[Country], [p1].[Name], [p1].[ParentId], [p1].[ZipCode], [p1].[Address_City], [p1].[Country], [p1].[ZipCode], [p2].[PersonId], [p2].[Country], [p2].[Name], [p2].[ParentId], [p2].[ZipCode], [p2].[Address_City], [p2].[Country], [p2].[ZipCode]
-FROM [Person] AS [p]
-LEFT JOIN [Person] AS [p0] ON [p].[ParentId] = [p0].[PersonId]
-LEFT JOIN [Person] AS [p1] ON [p0].[ParentId] = [p1].[PersonId]
-LEFT JOIN [Person] AS [p2] ON [p1].[ParentId] = [p2].[PersonId]
-""");
-    }
-
-    public override void Identifiers_are_generated_correctly()
-    {
-        using var context = CreateContext();
-        var entityType = context.Model.FindEntityType(
-            typeof(
-                LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingCorrectly
-            ))!;
-        Assert.Equal(
-            "LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorking~",
-            entityType.GetTableName());
-        Assert.Equal(
-            "PK_LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWork~",
-            entityType.GetKeys().Single().GetName());
-        Assert.Equal(
-            "FK_LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWork~",
-            entityType.GetForeignKeys().Single().GetConstraintName());
-        Assert.Equal(
-            "IX_LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWork~",
-            entityType.GetIndexes().Single().GetDatabaseName());
-
-        var entityType2 = context.Model.FindEntityType(
-            typeof(
-                LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingCorrectlyDetails
-            ))!;
-
-        Assert.Equal(
-            "LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkin~1",
-            entityType2.GetTableName());
-        Assert.Equal(
-            "PK_LoginDetails",
-            entityType2.GetKeys().Single().GetName());
-        Assert.Equal(
-            "ExtraPropertyWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingCo~",
-            entityType2.GetProperties().ElementAt(1).GetColumnName(StoreObjectIdentifier.Table(entityType2.GetTableName()!)));
-        Assert.Equal(
-            "ExtraPropertyWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingC~1",
-            entityType2.GetProperties().ElementAt(2).GetColumnName(StoreObjectIdentifier.Table(entityType2.GetTableName()!)));
-        Assert.Equal(
-            "IX_LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWork~",
-            entityType2.GetIndexes().Single().GetDatabaseName());
-    }
-
-    protected void AssertSql(params string[] expected)
-        => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
-
-    protected void AssertContainsSql(params string[] expected)
-        => Fixture.TestSqlLoggerFactory.AssertBaseline(expected, assertOrder: false);
-
-    public abstract class UpdatesJetFixtureBase : UpdatesRelationalFixture
-    {
-        protected override ITestStoreFactory TestStoreFactory
-            => JetTestStoreFactory.Instance;
-
-        public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder).ConfigureWarnings(w =>
-            {
-                w.Log(JetEventId.DecimalTypeKeyWarning);
-            });
-
-        protected override void ConfigureConventions(ModelConfigurationBuilder configurationBuilder)
-            => configurationBuilder.Properties<decimal>().HaveColumnType("decimal(18, 2)");
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
-        {
-            base.OnModelCreating(modelBuilder, context);
-
-            modelBuilder.Entity<ProductBase>()
-                .Property(p => p.Id).HasDefaultValueSql("NEWID()");
-
-            modelBuilder.Entity<Product>().HasIndex(p => new { p.Name, p.Price }).HasFilter("Name IS NOT NULL");
-
-            modelBuilder.Entity<Product>()
-                .HasIndex(e => new { e.Name, e.IsPrimaryNormalized })
-                .IsUnique()
-                .HasFilter(null);
-
-            modelBuilder.Entity<Product>()
-                .Property(e => e.IsPrimaryNormalized)
-                .HasComputedColumnSql("IIF(IsPrimary = 1, CONVERT(bit, 1), NULL)", stored: true);
-        }
-
-        public virtual async Task ResetIdentity()
-        {
-            var context = CreateContext();
-            await context.Database.ExecuteSqlRawAsync(ResetIdentitySql);
-            TestSqlLoggerFactory.Clear();
-        }
-
-        private const string ResetIdentitySql = @"
--- We can't use TRUNCATE on tables with foreign keys, so we DELETE and reset IDENTITY manually.
--- DBCC CHECKIDENT resets IDENTITY, but behaves differently based on whether whether rows were ever inserted (seed+1) or not (seed).
--- So we insert a dummy row before deleting everything to make sure we get the seed value 1.
-INSERT INTO [Person] ([Name]) VALUES ('');
-DELETE FROM [Person];
-DBCC CHECKIDENT ('[Person]', RESEED, 0);";
-    }
-}
diff --git a/test/EFCore.Jet.FunctionalTests/test.runsettings b/test/EFCore.Jet.FunctionalTests/test.runsettings
index e5200813..520de917 100644
--- a/test/EFCore.Jet.FunctionalTests/test.runsettings
+++ b/test/EFCore.Jet.FunctionalTests/test.runsettings
@@ -4,7 +4,7 @@
   <RunConfiguration>
     <EnvironmentVariables>
       <!-- List of environment variables we want to set-->
-      <EF_TEST_REWRITE_BASELINES>1</EF_TEST_REWRITE_BASELINES>
+      <EF_TEST_REWRITE_BASELINES>0</EF_TEST_REWRITE_BASELINES>
     </EnvironmentVariables>
   </RunConfiguration>
 </RunSettings>
\ No newline at end of file
diff --git a/test/EFCore.Jet.IntegrationTests/EFCore.Jet.IntegrationTests.csproj b/test/EFCore.Jet.IntegrationTests/EFCore.Jet.IntegrationTests.csproj
index 7b9b5bd2..76a4ec50 100644
--- a/test/EFCore.Jet.IntegrationTests/EFCore.Jet.IntegrationTests.csproj
+++ b/test/EFCore.Jet.IntegrationTests/EFCore.Jet.IntegrationTests.csproj
@@ -87,7 +87,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-rc.2.*" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
 	</ItemGroup>
 	
 	<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
diff --git a/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj b/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj
index 8f06624c..2a2f9362 100644
--- a/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj
+++ b/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj
@@ -34,7 +34,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.4.0" />
+		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.7.1" />
 		<PackageReference Include="xunit.core" />
 		<PackageReference Include="xunit.assert" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" />