From a8dca27c62f1dc62d36c025567647290724a6968 Mon Sep 17 00:00:00 2001
From: Geoffrey McElhanon <geoffrey@mcelhanon.com>
Date: Tue, 13 Feb 2024 15:23:17 -0600
Subject: [PATCH] Modified code gen to reduce code gen output from 8 lines to 1
 line for entities without any children.

---
 ...ces_EntityInterfaces.generated.approved.cs |   45 +-
 ...ces_EntityInterfaces.generated.approved.cs |  216 +--
 ...ces_EntityInterfaces.generated.approved.cs |   45 +-
 ...ces_EntityInterfaces.generated.approved.cs | 1191 ++++-------------
 ...ces_EntityInterfaces.generated.approved.cs |   45 +-
 ...ces_EntityInterfaces.generated.approved.cs |  216 +--
 ...ces_EntityInterfaces.generated.approved.cs |   45 +-
 ...ces_EntityInterfaces.generated.approved.cs |  882 ++----------
 .../Generators/EntityInterfaces.cs            |  124 +-
 .../Mustache/EntityInterfaces.mustache        |   22 +-
 10 files changed, 490 insertions(+), 2341 deletions(-)

diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
index 57b7038af7..8d5b0d85cc 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
@@ -58,14 +58,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -204,14 +197,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -460,14 +446,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -606,14 +585,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -818,14 +790,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
index 721fb8eaa6..d3a85f4a8e 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
@@ -138,14 +138,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -410,14 +403,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -533,14 +519,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -587,14 +566,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -973,14 +945,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -1027,14 +992,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -1081,14 +1039,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -1135,14 +1086,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -1534,14 +1478,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2457,14 +2394,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2511,14 +2441,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2637,14 +2560,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2843,14 +2759,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2897,14 +2806,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -3638,14 +3540,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -3692,14 +3587,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -3820,14 +3708,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -3874,14 +3755,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -3928,14 +3802,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4043,14 +3910,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4097,14 +3957,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4368,14 +4221,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4422,14 +4268,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4476,14 +4315,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
index b0b09c7e91..2b5ea5c5d0 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
@@ -822,14 +822,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -1279,14 +1272,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -1505,14 +1491,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2170,14 +2149,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4665,14 +4637,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
index b2ebb9b6ef..df8f632470 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
@@ -1449,14 +1449,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -1511,14 +1504,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -1789,14 +1775,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -2457,14 +2436,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -2766,14 +2738,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -3677,14 +3642,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -4111,14 +4069,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -4173,14 +4124,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -4430,14 +4374,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -4575,14 +4512,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -5421,14 +5351,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -7418,14 +7341,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -7951,14 +7867,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -8096,14 +8005,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -8317,14 +8219,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -8379,14 +8274,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -8441,14 +8329,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -8870,14 +8751,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9012,14 +8886,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9383,14 +9250,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9445,14 +9305,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9590,14 +9443,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -10326,14 +10172,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -11078,14 +10917,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -11781,14 +11613,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -11926,14 +11751,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -12333,14 +12151,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -12395,14 +12206,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -12457,14 +12261,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -12588,14 +12385,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -12650,14 +12440,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -12712,14 +12495,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -13232,14 +13008,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -15322,14 +15091,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -15469,14 +15231,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -19041,14 +18796,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -19103,14 +18851,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -19248,14 +18989,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -19535,14 +19269,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -19601,14 +19328,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -19663,14 +19383,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -19925,14 +19638,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -19987,14 +19693,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -20049,14 +19748,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -20180,14 +19872,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -20242,14 +19927,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -20304,14 +19982,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -20656,6 +20327,123 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
+
+        public IReadOnlyList<string> SupportedExtensions { get; }
+
+        public bool IsExtensionSupported(string name)
+        {
+            return SupportedExtensions.Contains(name);    
+        }
+    }
+
+    /// <summary>
+    /// Defines available properties and methods for the abstraction of the InterventionStudyAppropriateSex model.
+    /// </summary>
+    public interface IInterventionStudyAppropriateSex : ISynchronizable, IMappable, IHasExtensions, IGetByExample
+    {
+        // Primary Key properties
+        IInterventionStudy InterventionStudy { get; set; }
+        
+        string SexDescriptor { get; set; }
+
+        // Non-PK properties
+
+        // One-to-one relationships
+
+        // Lists
+
+        // Resource reference data
+    }
+
+    /// <summary>
+    /// Defines a mapping contract appropriate for a particular context when data is either being mapped or synchronized
+    /// between entities/resources during API request processing.
+    /// </summary>
+    public class InterventionStudyAppropriateSexMappingContract : IMappingContract, IExtensionsMappingContract
+    {
+        public InterventionStudyAppropriateSexMappingContract(
+            IReadOnlyList<string> supportedExtensions
+            )
+        {
+            SupportedExtensions = supportedExtensions;
+        }
+
+
+        bool IMappingContract.IsMemberSupported(string memberName)
+        {
+            switch (memberName)
+            {
+                // Additional inspection support for identifying properties (which are implicitly supported by Profiles) for use during validation
+                case "SexDescriptor":
+                    return true;
+                default:
+                    throw new Exception($"Unknown member '{memberName}'.");
+            }
+        }
+
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
+
+        public IReadOnlyList<string> SupportedExtensions { get; }
+
+        public bool IsExtensionSupported(string name)
+        {
+            return SupportedExtensions.Contains(name);    
+        }
+    }
+
+    /// <summary>
+    /// Defines available properties and methods for the abstraction of the InterventionStudyEducationContent model.
+    /// </summary>
+    public interface IInterventionStudyEducationContent : ISynchronizable, IMappable, IHasExtensions, IGetByExample
+    {
+        // Primary Key properties
+        IInterventionStudy InterventionStudy { get; set; }
+        
+        string ContentIdentifier { get; set; }
+
+        // Non-PK properties
+
+        // One-to-one relationships
+
+        // Lists
+
+        // Resource reference data
+        Guid? EducationContentResourceId { get; set; }
+        string EducationContentDiscriminator { get; set; }
+    }
+
+    /// <summary>
+    /// Defines a mapping contract appropriate for a particular context when data is either being mapped or synchronized
+    /// between entities/resources during API request processing.
+    /// </summary>
+    public class InterventionStudyEducationContentMappingContract : IMappingContract, IExtensionsMappingContract
+    {
+        public InterventionStudyEducationContentMappingContract(
+            bool isEducationContentReferenceSupported,
+            IReadOnlyList<string> supportedExtensions
+            )
+        {
+            IsEducationContentReferenceSupported = isEducationContentReferenceSupported;
+            SupportedExtensions = supportedExtensions;
+        }
+
+        public bool IsEducationContentReferenceSupported { get; }
+
+        bool IMappingContract.IsMemberSupported(string memberName)
+        {
+            switch (memberName)
+            {
+                case "EducationContentReference":
+                    return IsEducationContentReferenceSupported;
+                // Additional inspection support for identifying properties (which are implicitly supported by Profiles) for use during validation
+                case "ContentIdentifier":
+                    return true;
+                default:
+                    throw new Exception($"Unknown member '{memberName}'.");
+            }
+        }
+
         bool IMappingContract.IsItemCreatable(string memberName)
         {
             switch (memberName)
@@ -20674,16 +20462,22 @@ public bool IsExtensionSupported(string name)
     }
 
     /// <summary>
-    /// Defines available properties and methods for the abstraction of the InterventionStudyAppropriateSex model.
+    /// Defines available properties and methods for the abstraction of the InterventionStudyInterventionEffectiveness model.
     /// </summary>
-    public interface IInterventionStudyAppropriateSex : ISynchronizable, IMappable, IHasExtensions, IGetByExample
+    public interface IInterventionStudyInterventionEffectiveness : ISynchronizable, IMappable, IHasExtensions, IGetByExample
     {
         // Primary Key properties
         IInterventionStudy InterventionStudy { get; set; }
         
-        string SexDescriptor { get; set; }
+        string DiagnosisDescriptor { get; set; }
+        
+        string GradeLevelDescriptor { get; set; }
+        
+        string PopulationServedDescriptor { get; set; }
 
         // Non-PK properties
+        int? ImprovementIndex { get; set; }
+        string InterventionEffectivenessRatingDescriptor { get; set; }
 
         // One-to-one relationships
 
@@ -20696,173 +20490,36 @@ public interface IInterventionStudyAppropriateSex : ISynchronizable, IMappable,
     /// Defines a mapping contract appropriate for a particular context when data is either being mapped or synchronized
     /// between entities/resources during API request processing.
     /// </summary>
-    public class InterventionStudyAppropriateSexMappingContract : IMappingContract, IExtensionsMappingContract
+    public class InterventionStudyInterventionEffectivenessMappingContract : IMappingContract, IExtensionsMappingContract
     {
-        public InterventionStudyAppropriateSexMappingContract(
+        public InterventionStudyInterventionEffectivenessMappingContract(
+            bool isImprovementIndexSupported,
+            bool isInterventionEffectivenessRatingDescriptorSupported,
             IReadOnlyList<string> supportedExtensions
             )
         {
+            IsImprovementIndexSupported = isImprovementIndexSupported;
+            IsInterventionEffectivenessRatingDescriptorSupported = isInterventionEffectivenessRatingDescriptorSupported;
             SupportedExtensions = supportedExtensions;
         }
 
+        public bool IsImprovementIndexSupported { get; }
+        public bool IsInterventionEffectivenessRatingDescriptorSupported { get; }
 
         bool IMappingContract.IsMemberSupported(string memberName)
         {
             switch (memberName)
             {
+                case "ImprovementIndex":
+                    return IsImprovementIndexSupported;
+                case "InterventionEffectivenessRatingDescriptor":
+                    return IsInterventionEffectivenessRatingDescriptorSupported;
                 // Additional inspection support for identifying properties (which are implicitly supported by Profiles) for use during validation
-                case "SexDescriptor":
-                    return true;
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
-
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
-
-        public IReadOnlyList<string> SupportedExtensions { get; }
-
-        public bool IsExtensionSupported(string name)
-        {
-            return SupportedExtensions.Contains(name);    
-        }
-    }
-
-    /// <summary>
-    /// Defines available properties and methods for the abstraction of the InterventionStudyEducationContent model.
-    /// </summary>
-    public interface IInterventionStudyEducationContent : ISynchronizable, IMappable, IHasExtensions, IGetByExample
-    {
-        // Primary Key properties
-        IInterventionStudy InterventionStudy { get; set; }
-        
-        string ContentIdentifier { get; set; }
-
-        // Non-PK properties
-
-        // One-to-one relationships
-
-        // Lists
-
-        // Resource reference data
-        Guid? EducationContentResourceId { get; set; }
-        string EducationContentDiscriminator { get; set; }
-    }
-
-    /// <summary>
-    /// Defines a mapping contract appropriate for a particular context when data is either being mapped or synchronized
-    /// between entities/resources during API request processing.
-    /// </summary>
-    public class InterventionStudyEducationContentMappingContract : IMappingContract, IExtensionsMappingContract
-    {
-        public InterventionStudyEducationContentMappingContract(
-            bool isEducationContentReferenceSupported,
-            IReadOnlyList<string> supportedExtensions
-            )
-        {
-            IsEducationContentReferenceSupported = isEducationContentReferenceSupported;
-            SupportedExtensions = supportedExtensions;
-        }
-
-        public bool IsEducationContentReferenceSupported { get; }
-
-        bool IMappingContract.IsMemberSupported(string memberName)
-        {
-            switch (memberName)
-            {
-                case "EducationContentReference":
-                    return IsEducationContentReferenceSupported;
-                // Additional inspection support for identifying properties (which are implicitly supported by Profiles) for use during validation
-                case "ContentIdentifier":
-                    return true;
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
-
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
-
-        public IReadOnlyList<string> SupportedExtensions { get; }
-
-        public bool IsExtensionSupported(string name)
-        {
-            return SupportedExtensions.Contains(name);    
-        }
-    }
-
-    /// <summary>
-    /// Defines available properties and methods for the abstraction of the InterventionStudyInterventionEffectiveness model.
-    /// </summary>
-    public interface IInterventionStudyInterventionEffectiveness : ISynchronizable, IMappable, IHasExtensions, IGetByExample
-    {
-        // Primary Key properties
-        IInterventionStudy InterventionStudy { get; set; }
-        
-        string DiagnosisDescriptor { get; set; }
-        
-        string GradeLevelDescriptor { get; set; }
-        
-        string PopulationServedDescriptor { get; set; }
-
-        // Non-PK properties
-        int? ImprovementIndex { get; set; }
-        string InterventionEffectivenessRatingDescriptor { get; set; }
-
-        // One-to-one relationships
-
-        // Lists
-
-        // Resource reference data
-    }
-
-    /// <summary>
-    /// Defines a mapping contract appropriate for a particular context when data is either being mapped or synchronized
-    /// between entities/resources during API request processing.
-    /// </summary>
-    public class InterventionStudyInterventionEffectivenessMappingContract : IMappingContract, IExtensionsMappingContract
-    {
-        public InterventionStudyInterventionEffectivenessMappingContract(
-            bool isImprovementIndexSupported,
-            bool isInterventionEffectivenessRatingDescriptorSupported,
-            IReadOnlyList<string> supportedExtensions
-            )
-        {
-            IsImprovementIndexSupported = isImprovementIndexSupported;
-            IsInterventionEffectivenessRatingDescriptorSupported = isInterventionEffectivenessRatingDescriptorSupported;
-            SupportedExtensions = supportedExtensions;
-        }
-
-        public bool IsImprovementIndexSupported { get; }
-        public bool IsInterventionEffectivenessRatingDescriptorSupported { get; }
-
-        bool IMappingContract.IsMemberSupported(string memberName)
-        {
-            switch (memberName)
-            {
-                case "ImprovementIndex":
-                    return IsImprovementIndexSupported;
-                case "InterventionEffectivenessRatingDescriptor":
-                    return IsInterventionEffectivenessRatingDescriptorSupported;
-                // Additional inspection support for identifying properties (which are implicitly supported by Profiles) for use during validation
-                case "DiagnosisDescriptor":
-                    return true;
-                case "GradeLevelDescriptor":
-                    return true;
-                case "PopulationServedDescriptor":
+                case "DiagnosisDescriptor":
+                    return true;
+                case "GradeLevelDescriptor":
+                    return true;
+                case "PopulationServedDescriptor":
                     return true;
                 default:
                     throw new Exception($"Unknown member '{memberName}'.");
@@ -20931,14 +20588,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -20993,14 +20643,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21055,14 +20698,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21117,14 +20753,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21179,14 +20808,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21652,14 +21274,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21847,14 +21462,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21909,14 +21517,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22230,14 +21831,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22508,14 +22102,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22754,14 +22341,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22820,14 +22400,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -25537,14 +25110,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -26307,14 +25873,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -26369,14 +25928,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -26599,14 +26151,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -27641,14 +27186,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -28310,14 +27848,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -29143,14 +28674,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -29772,14 +29296,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -30002,14 +29519,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -30206,14 +29716,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -30268,14 +29771,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -30747,14 +30243,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -32847,14 +32336,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -33411,14 +32893,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -33722,14 +33197,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -34297,14 +33765,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -34511,14 +33972,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -34573,14 +34027,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -35404,14 +34851,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -36406,14 +35846,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -36820,14 +36253,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -38137,14 +37563,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -38667,14 +38086,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -38998,14 +38410,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -39060,14 +38465,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -39337,14 +38735,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -39399,14 +38790,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -41309,14 +40693,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -43377,14 +42754,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -43536,14 +42906,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -44165,14 +43528,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -44399,14 +43755,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -44731,14 +44080,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -44887,14 +44229,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -44949,14 +44284,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -45479,14 +44807,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -48726,14 +48047,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -49816,14 +49130,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -50438,14 +49745,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -51957,14 +51257,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
index 4025552228..37492befb9 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
@@ -147,14 +147,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -273,14 +266,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -460,14 +446,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -606,14 +585,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -818,14 +790,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
index 6841a4916d..2df6c2245f 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
@@ -138,14 +138,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -410,14 +403,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -533,14 +519,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -587,14 +566,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -807,14 +779,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -861,14 +826,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -915,14 +873,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -969,14 +920,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -1368,14 +1312,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2447,14 +2384,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2501,14 +2431,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2627,14 +2550,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2681,14 +2597,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2952,14 +2861,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -3006,14 +2908,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -3060,14 +2955,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -3419,14 +3307,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -3473,14 +3354,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4214,14 +4088,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4268,14 +4135,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4396,14 +4256,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4450,14 +4303,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4504,14 +4350,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4619,14 +4458,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
index 55114cfa0a..4ea1b6df3c 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
@@ -834,14 +834,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -1291,14 +1284,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -1517,14 +1503,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -2182,14 +2161,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
@@ -4677,14 +4649,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
     }
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Standard_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Standard_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
index 11d1a10351..de633a1df7 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Standard_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.0.0/DataStandard_500_ApprovalTests.Verify.Standard_Std_5.0.0_Models_Interfaces_EntityInterfaces.generated.approved.cs
@@ -1449,14 +1449,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -1511,14 +1504,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -1789,14 +1775,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -2457,14 +2436,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -2766,14 +2738,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -3677,14 +3642,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -4111,14 +4069,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -4173,14 +4124,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -4430,14 +4374,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -4575,14 +4512,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -5421,14 +5351,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -7399,14 +7322,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -8400,14 +8316,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -8545,14 +8454,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9005,14 +8907,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9150,14 +9045,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9371,14 +9259,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9433,14 +9314,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9495,14 +9369,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -9959,14 +9826,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -10174,14 +10034,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -10626,14 +10479,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -10688,14 +10534,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -10833,14 +10672,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -11569,14 +11401,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -12301,14 +12126,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -12918,14 +12736,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -13063,14 +12874,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -13470,14 +13274,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -13532,14 +13329,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -13594,14 +13384,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -13725,14 +13508,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -13787,14 +13563,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -13849,14 +13618,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -14369,14 +14131,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -16905,14 +16660,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -17052,14 +16800,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -20625,14 +20366,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -20687,14 +20421,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -20832,14 +20559,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21119,14 +20839,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21185,14 +20898,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21247,14 +20953,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21509,14 +21208,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21571,14 +21263,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21633,14 +21318,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21764,14 +21442,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21826,14 +21497,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -21888,14 +21552,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22240,14 +21897,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22302,14 +21952,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22515,14 +22158,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22577,14 +22213,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22639,14 +22268,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22701,14 +22323,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -22763,14 +22378,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -23250,14 +22858,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -23528,14 +23129,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -23774,14 +23368,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -23840,14 +23427,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -26488,14 +26068,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -27175,14 +26748,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -27237,14 +26803,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -27467,14 +27026,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -28125,14 +27677,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -28958,14 +28503,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -29559,14 +29097,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -29789,14 +29320,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -30701,14 +30225,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -31180,14 +30697,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -33264,14 +32774,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -33828,14 +33331,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -34222,14 +33718,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -34803,14 +34292,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -35017,14 +34499,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -35079,14 +34554,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -35993,14 +35461,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -37090,14 +36551,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -37504,14 +36958,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -38827,14 +38274,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -39357,14 +38797,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -39688,14 +39121,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -39750,14 +39176,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -40025,14 +39444,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -40087,14 +39499,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -41979,14 +41384,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -43799,14 +43197,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -43958,14 +43349,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -44579,14 +43963,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -44813,14 +44190,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -45145,14 +44515,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -45207,14 +44570,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -45737,14 +45093,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -48367,14 +47716,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -48948,14 +48290,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -50127,14 +49462,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -50833,14 +50161,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
@@ -52435,14 +51756,7 @@ bool IMappingContract.IsMemberSupported(string memberName)
             }
         }
 
-        bool IMappingContract.IsItemCreatable(string memberName)
-        {
-            switch (memberName)
-            {
-                default:
-                    throw new Exception($"Unknown member '{memberName}'.");
-            }
-        }
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
 
         public IReadOnlyList<string> SupportedExtensions { get; }
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/EntityInterfaces.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/EntityInterfaces.cs
index 552a85a06d..d45c0ebf42 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/EntityInterfaces.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/EntityInterfaces.cs
@@ -3,6 +3,7 @@
 // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
 // See the LICENSE and NOTICES files in the project root for more information.
 
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -166,6 +167,7 @@ protected override object Build()
                                                 a.OtherEntity.HasDiscriminator()
                                         })
                                     .ToList(),
+                            HasMappingContractMembers = GetMappingContractMembers(r).Any(),
                             MappingContractMembers = GetMappingContractMembers(r),
                             IsExtendable = r.IsExtendable()
                         })
@@ -271,65 +273,75 @@ private bool IsModelInterfaceProperty(ResourceProperty p)
             }.Contains(p.PropertyName);
         }
 
+        private readonly ConcurrentDictionary<FullName, IEnumerable<object>> _mappingContractMembersByFullName = new();
+
         private IEnumerable<object> GetMappingContractMembers(ResourceClassBase resourceClass)
         {
-            var properties = resourceClass.AllProperties
-
-                // Don't include properties that are not synchronizable
-                .Where(p => p.IsSynchronizedProperty())
-
-                // Don't include identifying properties, with the exception of where UniqueIds are defined
-                .Where(p => !p.IsIdentifying || _personEntitySpecification.IsDefiningUniqueId(resourceClass, p))
-                .Select(p => p.PropertyName)
-
-                // Add embedded object properties
-                .Concat(
-                    resourceClass.EmbeddedObjects.Cast<ResourceMemberBase>()
-                        .Concat(resourceClass.References)
-                        .Concat(resourceClass.Extensions)
-                        .Concat(resourceClass.Collections)
-                        .Select(rc => rc.PropertyName))
-                .Distinct()
-                .OrderBy(pn => pn)
-                .Select(pn => new
-                {
-                    PropertyName = pn,
-                    ItemTypeName = null as string,
-                    IsCollection = false,
-                });
-
-            var embeddedObjects = resourceClass.EmbeddedObjects
-                .OrderBy(c => c.ObjectType.Name)
-                .Select(c => new
+            return _mappingContractMembersByFullName.GetOrAdd(resourceClass.FullName,
+                static (fn, args) =>
                 {
-                    PropertyName = c.PropertyName,
-                    ItemTypeName = c.ObjectType.Name,
-                    IsCollection = false,
-                });
-
-            var collections = resourceClass.Collections
-                .OrderBy(c => c.ItemType.Name)
-                .Select(c => new
-                {
-                    PropertyName = c.PropertyName,
-                    ItemTypeName = c.ItemType.Name,
-                    IsCollection = true,
-                });
-
-            var members = properties
-                .Concat(embeddedObjects)
-                .Concat(collections)
-                .ToList();
-        
-            return members.Select(
-                x =>
-                    new
-                    {
-                        PropertyName = x.PropertyName,
-                        ItemTypeName = x.ItemTypeName,
-                        IsCollection = x.IsCollection,
-                        IsLast = x == members.Last() && !resourceClass.IsExtendable()
-                    });
+                    var rc = args.resourceClass;
+                    var personEntitySpecification = args.personEntitySpecification;
+                    
+                    var properties = rc.AllProperties
+
+                        // Don't include properties that are not synchronizable
+                        .Where(p => p.IsSynchronizedProperty())
+
+                        // Don't include identifying properties, with the exception of where UniqueIds are defined
+                        .Where(p => !p.IsIdentifying || personEntitySpecification.IsDefiningUniqueId(rc, p))
+                        .Select(p => p.PropertyName)
+
+                        // Add embedded object properties
+                        .Concat(
+                            rc.EmbeddedObjects.Cast<ResourceMemberBase>()
+                                .Concat(rc.References)
+                                .Concat(rc.Extensions)
+                                .Concat(rc.Collections)
+                                .Select(rc => rc.PropertyName))
+                        .Distinct()
+                        .OrderBy(pn => pn)
+                        .Select(pn => new
+                        {
+                            PropertyName = pn,
+                            ItemTypeName = null as string,
+                            IsCollection = false,
+                        });
+
+                    var embeddedObjects = rc.EmbeddedObjects
+                        .OrderBy(c => c.ObjectType.Name)
+                        .Select(c => new
+                        {
+                            PropertyName = c.PropertyName,
+                            ItemTypeName = c.ObjectType.Name,
+                            IsCollection = false,
+                        });
+
+                    var collections = rc.Collections
+                        .OrderBy(c => c.ItemType.Name)
+                        .Select(c => new
+                        {
+                            PropertyName = c.PropertyName,
+                            ItemTypeName = c.ItemType.Name,
+                            IsCollection = true,
+                        });
+
+                    var members = properties
+                        .Concat(embeddedObjects)
+                        .Concat(collections)
+                        .ToList();
+                
+                    return members.Select(
+                        x =>
+                            new
+                            {
+                                PropertyName = x.PropertyName,
+                                ItemTypeName = x.ItemTypeName,
+                                IsCollection = x.IsCollection,
+                                IsLast = x == members.Last() && !rc.IsExtendable()
+                            });
+                        }, 
+                (resourceClass: resourceClass, personEntitySpecification: _personEntitySpecification));
         }
     }
 }
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityInterfaces.mustache b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityInterfaces.mustache
index 54febb0508..66638c486d 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityInterfaces.mustache
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityInterfaces.mustache
@@ -153,27 +153,33 @@ namespace {{EntitiesBaseNamespace}}
             }
         }
 
+    {{#HasMappingContractMembers}}
         bool IMappingContract.IsItemCreatable(string memberName)
         {
             switch (memberName)
             {
-    {{#MappingContractMembers}}
-        {{#ItemTypeName}}
-            {{#IsCollection}}
+        {{#MappingContractMembers}}
+            {{#ItemTypeName}}
+                {{#IsCollection}}
                 case "{{PropertyName}}":
                     return Is{{PropertyName}}ItemCreatable;
-            {{/IsCollection}}
-            {{^IsCollection}}
+                {{/IsCollection}}
+                {{^IsCollection}}
                 case "{{PropertyName}}":
                     return Is{{PropertyName}}Creatable;
-            {{/IsCollection}}
-        {{/ItemTypeName}}
-    {{/MappingContractMembers}}
+                {{/IsCollection}}
+            {{/ItemTypeName}}
+        {{/MappingContractMembers}}
                 default:
                     throw new Exception($"Unknown member '{memberName}'.");
             }
         }
 
+    {{/HasMappingContractMembers}}
+    {{^HasMappingContractMembers}}
+        bool IMappingContract.IsItemCreatable(string memberName) => throw new Exception($"Member '{memberName}' does not exist.");
+
+    {{/HasMappingContractMembers}}
     {{#IsExtendable}}
         public IReadOnlyList<string> SupportedExtensions { get; }