From 1bf6a6a038b154d3116a6e211f5330f36cb8acf6 Mon Sep 17 00:00:00 2001
From: Malhar Khimsaria <96malhar@gmail.com>
Date: Wed, 21 Aug 2024 15:10:35 -0700
Subject: [PATCH] Add the ability to mock document model operations in DynamoDB
 (#3446)

* Add the ability to mock DocumentBatchGet and MultiTableDocumentBatchGet operations

* Add the ability to mock DocumentBatchWrite and MultiTableDocumentBatchWrite operations

* Add the ability to mock DocumentTransactGet and MultiTableDocumentTransactGet operations

* Add the ability to mock DocumentTransactWrite and MultiTableDocumentTransactWrite operations

* Add the ability to mock Search operations in Document model

* Add the ability to mock Table operations in Document model

* Fix typos
---
 .../DynamoDBv2/Custom/DataModel/BatchWrite.cs |   5 +-
 .../Custom/DataModel/ContextInternal.cs       |  18 +-
 .../Custom/DataModel/TransactGet.cs           |   5 +-
 .../Custom/DataModel/TransactWrite.cs         |   5 +-
 .../Custom/DataModel/_bcl/Context.Sync.cs     |   6 +-
 .../DataModel/_bcl/IDynamoDBContext.Sync.cs   |   6 +-
 .../DataModel/_netstandard/Context.Sync.cs    |   9 +-
 .../_netstandard/IDynamoDBContext.Sync.cs     |   8 +-
 .../Custom/DocumentModel/DocumentBatchGet.cs  | 157 ++++---
 .../DocumentModel/DocumentBatchWrite.cs       | 133 ++++--
 .../DocumentModel/DocumentTransactGet.cs      | 195 ++++++---
 .../DocumentModel/DocumentTransactWrite.cs    | 386 ++++++++++------
 .../DynamoDBv2/Custom/DocumentModel/Search.cs | 166 ++++---
 .../DynamoDBv2/Custom/DocumentModel/Table.cs  | 414 +++++++++++-------
 .../_async/DocumentBatchGet.Async.cs          |  37 +-
 .../_async/DocumentBatchWrite.Async.cs        |  37 +-
 .../_async/DocumentTransactGet.Async.cs       |  30 +-
 .../_async/DocumentTransactWrite.Async.cs     |  32 +-
 .../DocumentModel/_async/Search.Async.cs      |  37 +-
 .../DocumentModel/_async/Table.Async.cs       | 282 ++++++++----
 .../_bcl/DocumentBatchGet.Sync.cs             |  39 +-
 .../_bcl/DocumentBatchWrite.Sync.cs           |  39 +-
 .../_bcl/DocumentTransactGet.Sync.cs          |  30 +-
 .../_bcl/DocumentTransactWrite.Sync.cs        |  32 +-
 .../Custom/DocumentModel/_bcl/Search.Sync.cs  |  33 +-
 .../Custom/DocumentModel/_bcl/Table.Sync.cs   | 371 +++++++++-------
 .../DynamoDBv2/IntegrationTests/Cache.cs      |   2 +-
 .../IntegrationTests/DocumentTests.cs         |  74 ++--
 .../DynamoDBv2/IntegrationTests/Extensions.cs |   2 +-
 .../DynamoDBv2/IntegrationTests/JSONTests.cs  |   6 +-
 .../DynamoDBv2/IntegrationTests/TTLTests.cs   |  10 +-
 .../MockabilityTests/DocumentBatchGetTests.cs | 155 +++++++
 .../DocumentBatchWriteTests.cs                | 118 +++++
 .../MockabilityTests/DocumentSearchTests.cs   |  72 +++
 .../DocumentTransactGetTests.cs               | 122 ++++++
 .../DocumentTransactWriteTests.cs             | 117 +++++
 36 files changed, 2159 insertions(+), 1031 deletions(-)
 create mode 100644 sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentBatchGetTests.cs
 create mode 100644 sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentBatchWriteTests.cs
 create mode 100644 sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentSearchTests.cs
 create mode 100644 sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentTransactGetTests.cs
 create mode 100644 sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentTransactWriteTests.cs

diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/BatchWrite.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/BatchWrite.cs
index 8c45afba89ea..4f773862f684 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/BatchWrite.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/BatchWrite.cs
@@ -128,7 +128,10 @@ internal BatchWrite(DynamoDBContext context, Type valuesType, DynamoDBFlatConfig
             }
 
             Table table = _context.GetTargetTable(_storageConfig, _config);
-            DocumentBatch = table.CreateBatchWrite();
+
+            // Table.CreateBatchWrite() returns the IDocumentBatchWrite interface.
+            // But since we rely on the internal behavior of DocumentBatchWrite, we instantiate it via the constructor.
+            DocumentBatch = new DocumentBatchWrite(table);
         }
 
         /// <inheritdoc/>
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs
index 3d0431f664cc..b692b1bc806a 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs
@@ -192,7 +192,7 @@ internal Table GetUnconfiguredTable(string tableName, bool disableFetchingTableM
                 
                 var emptyConfig = new TableConfig(tableName, conversion: null, consumer: Table.DynamoDBConsumer.DataModel,
                     storeAsEpoch: null, isEmptyStringValueEnabled: false, metadataCachingMode: Config.MetadataCachingMode);
-                table = Table.LoadTable(Client, emptyConfig);
+                table = Table.LoadTable(Client, emptyConfig) as Table;
                 tablesMap[tableName] = table;
 
                 return table;
@@ -1183,7 +1183,9 @@ private ContextSearch ConvertScan<T>(IEnumerable<ScanCondition> conditions, Dyna
                 IndexName = flatConfig.IndexName,
                 ConsistentRead = flatConfig.ConsistentRead.GetValueOrDefault(false)
             };
-            Search scan = table.Scan(scanConfig);
+
+            // table.Scan() returns the ISearch interface but we explicitly cast it to a Search object since we rely on its internal behavior
+            Search scan = table.Scan(scanConfig) as Search;
             return new ContextSearch(scan, flatConfig);
         }
 
@@ -1192,7 +1194,9 @@ private ContextSearch ConvertFromScan<T>(ScanOperationConfig scanConfig, DynamoD
             DynamoDBFlatConfig flatConfig = new DynamoDBFlatConfig(operationConfig, Config);
             ItemStorageConfig storageConfig = StorageConfigCache.GetConfig<T>(flatConfig);
             Table table = GetTargetTable(storageConfig, flatConfig);
-            Search search = table.Scan(scanConfig);
+
+            // table.Scan() returns the ISearch interface but we explicitly cast it to a Search object since we rely on its internal behavior
+            Search search = table.Scan(scanConfig) as Search;
             return new ContextSearch(search, flatConfig);
         }
 
@@ -1201,7 +1205,9 @@ private ContextSearch ConvertFromQuery<T>(QueryOperationConfig queryConfig, Dyna
             DynamoDBFlatConfig flatConfig = new DynamoDBFlatConfig(operationConfig, Config);
             ItemStorageConfig storageConfig = StorageConfigCache.GetConfig<T>(flatConfig);
             Table table = GetTargetTable(storageConfig, flatConfig);
-            Search search = table.Query(queryConfig);
+
+            // table.Query() returns the ISearch interface but we explicitly cast it to a Search object since we rely on its internal behavior
+            Search search = table.Query(queryConfig) as Search;
             return new ContextSearch(search, flatConfig);
         }
 
@@ -1246,7 +1252,9 @@ private ContextSearch ConvertQueryHelper<T>(DynamoDBFlatConfig currentConfig, It
             {
                 queryConfig.Select = SelectValues.AllProjectedAttributes;
             }
-            Search query = table.Query(queryConfig);
+
+            // table.Query() returns the ISearch interface but we explicitly cast it to a Search object since we rely on its internal behavior
+            Search query = table.Query(queryConfig) as Search;
 
             return new ContextSearch(query, currentConfig);
         }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/TransactGet.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/TransactGet.cs
index a2907383a896..7daa14368bb6 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/TransactGet.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/TransactGet.cs
@@ -157,7 +157,10 @@ internal TransactGet(DynamoDBContext context, DynamoDBFlatConfig config)
             _config = config;
             _storageConfig = context.StorageConfigCache.GetConfig<T>(config);
             var table = context.GetTargetTable(_storageConfig, config);
-            DocumentTransaction = table.CreateTransactGet();
+
+            // Table.CreateTransactGet() returns the IDocumentTransactGet interface.
+            // But since we rely on the internal behavior of DocumentTransactGet, we instantiate it via the constructor.
+            DocumentTransaction = new DocumentTransactGet(table);
         }
 
         private void ExecuteHelper()
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/TransactWrite.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/TransactWrite.cs
index 42ff4668e246..de61ba6addaa 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/TransactWrite.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/TransactWrite.cs
@@ -188,7 +188,10 @@ internal TransactWrite(DynamoDBContext context, DynamoDBFlatConfig config)
             _config = config;
             _storageConfig = context.StorageConfigCache.GetConfig<T>(config);
             Table table = _context.GetTargetTable(_storageConfig, _config);
-            DocumentTransaction = table.CreateTransactWrite();
+
+            // table.CreateTransactWrite() return the IDocumentTransactWrite interface.
+            // But since we rely on the internal behavior of DocumentTransactWrite, we instatiate it via the constructor.
+            DocumentTransaction = new DocumentTransactWrite(table);
         }
 
         /// <inheritdoc/>
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_bcl/Context.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_bcl/Context.Sync.cs
index 4207dc5833c6..612209360b23 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_bcl/Context.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_bcl/Context.Sync.cs
@@ -348,20 +348,20 @@ public IEnumerable<T> FromQuery<T>(QueryOperationConfig queryConfig, FromQueryCo
         #region Table methods
 
         /// <inheritdoc/>
-        public Table GetTargetTable<T>()
+        public ITable GetTargetTable<T>()
         {
             return GetTargetTable<T>((GetTargetTableConfig)null);
         }
 
         /// <inheritdoc/>
         [Obsolete("Use the GetTargetTable overload that takes GetTargetTableConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to GetTargetTable.")]
-        public Table GetTargetTable<T>(DynamoDBOperationConfig operationConfig = null)
+        public ITable GetTargetTable<T>(DynamoDBOperationConfig operationConfig = null)
         {
             return GetTargetTableInternal<T>(new DynamoDBFlatConfig(operationConfig, Config));
         }
 
         /// <inheritdoc/>
-        public Table GetTargetTable<T>(GetTargetTableConfig getTargetTableConfig)
+        public ITable GetTargetTable<T>(GetTargetTableConfig getTargetTableConfig)
         {
             return GetTargetTableInternal<T>(new DynamoDBFlatConfig(getTargetTableConfig?.ToDynamoDBOperationConfig(), Config));
         }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_bcl/IDynamoDBContext.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_bcl/IDynamoDBContext.Sync.cs
index 1c8c6b36d67b..e500bcb20ce8 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_bcl/IDynamoDBContext.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_bcl/IDynamoDBContext.Sync.cs
@@ -593,7 +593,7 @@ partial interface IDynamoDBContext
         /// </summary>
         /// <typeparam name="T">Type to retrieve table for</typeparam>
         /// <returns>Table object</returns>
-        Table GetTargetTable<T>();
+        ITable GetTargetTable<T>();
 
         /// <summary>
         /// Retrieves the target table for the specified type
@@ -602,7 +602,7 @@ partial interface IDynamoDBContext
         /// <param name="operationConfig">Config object which can be used to override that table used.</param>
         /// <returns>Table object</returns>
         [Obsolete("Use the GetTargetTable overload that takes GetTargetTableConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to GetTargetTable.")]
-        Table GetTargetTable<T>(DynamoDBOperationConfig operationConfig = null);
+        ITable GetTargetTable<T>(DynamoDBOperationConfig operationConfig = null);
 
         /// <summary>
         /// Retrieves the target table for the specified type
@@ -610,7 +610,7 @@ partial interface IDynamoDBContext
         /// <typeparam name="T">Type to retrieve table for</typeparam>
         /// <param name="getTargetTableConfig">Config object that can be used to override properties on the table's context for this request.</param>
         /// <returns>Table object</returns>
-        Table GetTargetTable<T>(GetTargetTableConfig getTargetTableConfig);
+        ITable GetTargetTable<T>(GetTargetTableConfig getTargetTableConfig);
 
         #endregion
     }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_netstandard/Context.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_netstandard/Context.Sync.cs
index 085925e38fa1..d268cea1fc2f 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_netstandard/Context.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_netstandard/Context.Sync.cs
@@ -14,11 +14,8 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
 using Amazon.DynamoDBv2.DocumentModel;
-using Amazon.DynamoDBv2.Model;
 
 namespace Amazon.DynamoDBv2.DataModel
 {
@@ -27,20 +24,20 @@ public partial class DynamoDBContext : IDynamoDBContext
         #region Table methods
 
         /// <inheritdoc/>
-        public Table GetTargetTable<T>()
+        public ITable GetTargetTable<T>()
         {
             return GetTargetTableInternal<T>(new DynamoDBFlatConfig(null, Config));
         }
 
         /// <inheritdoc/>
         [Obsolete("Use the GetTargetTable overload that takes GetTargetTableConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to GetTargetTable.")]
-        public Table GetTargetTable<T>(DynamoDBOperationConfig operationConfig = null)
+        public ITable GetTargetTable<T>(DynamoDBOperationConfig operationConfig = null)
         {
             return GetTargetTableInternal<T>(new DynamoDBFlatConfig(operationConfig, Config));
         }
 
         /// <inheritdoc/>
-        public Table GetTargetTable<T>(GetTargetTableConfig getTargetTableConfig)
+        public ITable GetTargetTable<T>(GetTargetTableConfig getTargetTableConfig)
         {
             return GetTargetTableInternal<T>(new DynamoDBFlatConfig(getTargetTableConfig?.ToDynamoDBOperationConfig(), Config));
         }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_netstandard/IDynamoDBContext.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_netstandard/IDynamoDBContext.Sync.cs
index 48a267e7636a..61c921feafcf 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_netstandard/IDynamoDBContext.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_netstandard/IDynamoDBContext.Sync.cs
@@ -14,10 +14,8 @@
  */
 
 using System;
-using System.Collections.Generic;
 
 using Amazon.DynamoDBv2.DocumentModel;
-using Amazon.DynamoDBv2.Model;
 
 namespace Amazon.DynamoDBv2.DataModel
 {
@@ -34,7 +32,7 @@ partial interface IDynamoDBContext
         /// </summary>
         /// <typeparam name="T">Type to retrieve table for</typeparam>
         /// <returns>Table object</returns>
-        Table GetTargetTable<T>();
+        ITable GetTargetTable<T>();
 
         /// <summary>
         /// Retrieves the target table for the specified type
@@ -42,14 +40,14 @@ partial interface IDynamoDBContext
         /// <typeparam name="T">Type to retrieve table for</typeparam>
         /// <returns>Table object</returns>
         [Obsolete("Use the GetTargetTable overload that takes GetTargetTableConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to GetTargetTable.")]
-        Table GetTargetTable<T>(DynamoDBOperationConfig operationConfig = null);
+        ITable GetTargetTable<T>(DynamoDBOperationConfig operationConfig = null);
 
         /// <summary>
         /// Retrieves the target table for the specified type
         /// </summary>
         /// <typeparam name="T">Type to retrieve table for</typeparam>
         /// <returns>Table object</returns>
-        Table GetTargetTable<T>(GetTargetTableConfig getTargetTableConfig);
+        ITable GetTargetTable<T>(GetTargetTableConfig getTargetTableConfig);
 
         #endregion
     }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentBatchGet.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentBatchGet.cs
index bcec76d707f6..aed84740d092 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentBatchGet.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentBatchGet.cs
@@ -21,14 +21,70 @@
 using System.Threading.Tasks;
 #endif
 using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
+    /// <summary>
+    /// Interface for retrieving a batch of Documents from a single DynamoDB table.
+    /// </summary>
+    public partial interface IDocumentBatchGet
+    {
+        /// <summary>
+        /// List of results retrieved from DynamoDB.
+        /// Populated after Execute is called.
+        /// </summary>
+        public List<Document> Results { get; }
+
+        /// <summary>
+        /// List of attributes to retrieve.
+        /// </summary>
+        public List<string> AttributesToGet { get; set; }
+
+        /// <summary>
+        /// Returns the total number of keys associated with this Batch request.
+        /// </summary>
+        public int TotalKeys { get; }
+
+        /// <summary>
+        /// If set to true, a consistent read is issued. Otherwise eventually-consistent is used.
+        /// </summary>
+        public bool ConsistentRead { get; set; }
+
+        /// <summary>
+        /// Add a single item to get, identified by its hash primary key.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to get.</param>
+        void AddKey(Primitive hashKey);
+
+        /// <summary>
+        /// Add a single item to get, identified by its hash-and-range primary key.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to get.</param>
+        /// <param name="rangeKey">Range key element of the item to get.</param>
+        void AddKey(Primitive hashKey, Primitive rangeKey);
+
+        /// <summary>
+        /// Add a single item to get, identified by its key.
+        /// </summary>
+        /// <param name="key">Key of the item to get.</param>
+        void AddKey(IDictionary<string, DynamoDBEntry> key);
+
+        /// <summary>
+        /// Creates a MultiTableDocumentBatchGet object that is a combination
+        /// of the current DocumentBatchGet and the specified DocumentBatchGet.
+        /// </summary>
+        /// <param name="otherBatch">Other DocumentBatchGet object.</param>
+        /// <returns>
+        /// MultiTableDocumentBatchGet consisting of the two DocumentBatchGet
+        /// objects.
+        /// </returns>
+        IMultiTableDocumentBatchGet Combine(IDocumentBatchGet otherBatch);
+    }
+
     /// <summary>
     /// Class for retrieving a batch of Documents from a single DynamoDB table.
     /// </summary>
-    public partial class DocumentBatchGet
+    public partial class DocumentBatchGet : IDocumentBatchGet
     {
         #region Internal properties
 
@@ -40,20 +96,16 @@ public partial class DocumentBatchGet
 
         #region Public properties
 
-        /// <summary>
-        /// List of results retrieved from DynamoDB.
-        /// Populated after Execute is called.
-        /// </summary>
+        /// <inheritdoc/>
         public List<Document> Results { get; internal set; }
 
-        /// <summary>
-        /// List of attributes to retrieve.
-        /// </summary>
+        /// <inheritdoc/>
         public List<string> AttributesToGet { get; set; }
 
-        /// <summary>
-        /// If set to true, a consistent read is issued. Otherwise eventually-consistent is used.
-        /// </summary>
+        /// <inheritdoc/>
+        public int TotalKeys => Keys.Count;
+
+        /// <inheritdoc/>
         public bool ConsistentRead { get; set; }
 
         #endregion
@@ -76,44 +128,26 @@ public DocumentBatchGet(Table targetTable)
 
         #region Public methods
 
-        /// <summary>
-        /// Add a single item to get, identified by its hash primary key.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to get.</param>
+        /// <inheritdoc/>
         public void AddKey(Primitive hashKey)
         {
             AddKey(hashKey, null);
         }
 
-        /// <summary>
-        /// Add a single item to get, identified by its hash-and-range primary key.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to get.</param>
-        /// <param name="rangeKey">Range key element of the item to get.</param>
+        /// <inheritdoc/>
         public void AddKey(Primitive hashKey, Primitive rangeKey)
         {
             Keys.Add(TargetTable.MakeKey(hashKey, rangeKey));
         }
 
-        /// <summary>
-        /// Add a single item to get, identified by its key.
-        /// </summary>
-        /// <param name="key">Key of the item to get.</param>
+        /// <inheritdoc/>
         public void AddKey(IDictionary<string, DynamoDBEntry> key)
         {
             Keys.Add(TargetTable.MakeKey(key));
         }
 
-        /// <summary>
-        /// Creates a MultiTableDocumentBatchGet object that is a combination
-        /// of the current DocumentBatchGet and the specified DocumentBatchGet.
-        /// </summary>
-        /// <param name="otherBatch">Other DocumentBatchGet object.</param>
-        /// <returns>
-        /// MultiTableDocumentBatchGet consisting of the two DocumentBatchGet
-        /// objects.
-        /// </returns>
-        public MultiTableDocumentBatchGet Combine(DocumentBatchGet otherBatch)
+        /// <inheritdoc/>
+        public IMultiTableDocumentBatchGet Combine(IDocumentBatchGet otherBatch)
         {
             return new MultiTableDocumentBatchGet(this, otherBatch);
         }
@@ -179,21 +213,39 @@ internal void AddKey(Key key)
     }
 
     /// <summary>
-    /// Class for retrieving a batch of Documents from multiple DynamoDB tables.
+    /// Interface for retrieving a batch of Documents from multiple DynamoDB tables.
     /// </summary>
-    public partial class MultiTableDocumentBatchGet
+    public partial interface IMultiTableDocumentBatchGet
     {
-        #region Properties
-
         /// <summary>
         /// List of DocumentBatchGet objects to include in the multi-table
         /// batch request.
         /// </summary>
-        public List<DocumentBatchGet> Batches { get; private set; }
+        public List<IDocumentBatchGet> Batches { get; }
 
         /// <summary>
         /// Total number of primary keys in the multi-table batch request.
         /// </summary>
+        public int TotalKeys { get; }
+
+        /// <summary>
+        /// Add a DocumentBatchGet object to the multi-table batch request.
+        /// </summary>
+        /// <param name="batch">DocumentBatchGet to add.</param>
+        void AddBatch(IDocumentBatchGet batch);
+    }
+
+    /// <summary>
+    /// Class for retrieving a batch of Documents from multiple DynamoDB tables.
+    /// </summary>
+    public partial class MultiTableDocumentBatchGet : IMultiTableDocumentBatchGet
+    {
+        #region Properties
+
+        /// <inheritdoc/>
+        public List<IDocumentBatchGet> Batches { get; private set; }
+
+        /// <inheritdoc/>
         public int TotalKeys
         {
             get
@@ -201,7 +253,7 @@ public int TotalKeys
                 int count = 0;
                 foreach (var batch in Batches)
                 {
-                    count += batch.Keys.Count;
+                    count += batch.TotalKeys;
                 }
                 return count;
             }
@@ -217,12 +269,12 @@ public int TotalKeys
         /// DocumentBatchGet objects.
         /// </summary>
         /// <param name="batches">Collection of DocumentBatchGet objects.</param>
-        public MultiTableDocumentBatchGet(params DocumentBatchGet[] batches)
+        public MultiTableDocumentBatchGet(params IDocumentBatchGet[] batches)
         {
             if (batches == null)
                 throw new ArgumentNullException("batches");
 
-            Batches = new List<DocumentBatchGet>(batches);
+            Batches = new List<IDocumentBatchGet>(batches);
         }
 
         #endregion
@@ -230,11 +282,8 @@ public MultiTableDocumentBatchGet(params DocumentBatchGet[] batches)
 
         #region Public methods
 
-        /// <summary>
-        /// Add a DocumentBatchGet object to the multi-table batch request.
-        /// </summary>
-        /// <param name="batch">DocumentBatchGet to add.</param>
-        public void AddBatch(DocumentBatchGet batch)
+        /// <inheritdoc/>
+        public void AddBatch(IDocumentBatchGet batch)
         {
             Batches.Add(batch);
         }
@@ -245,14 +294,16 @@ public void AddBatch(DocumentBatchGet batch)
 
         internal void ExecuteHelper()
         {
+            var errMsg = $"All {nameof(IDocumentBatchGet)} objects must be of type {nameof(DocumentBatchGet)}";
+            var docBatches = Batches.Select( x => x as DocumentBatchGet ?? throw new InvalidOperationException(errMsg)).ToList();
             MultiBatchGet resultsObject = new MultiBatchGet
             {
-                Batches = Batches
+                Batches = docBatches
             };
 
             var results = resultsObject.GetItemsHelper();
 
-            foreach (var batch in Batches)
+            foreach (var batch in docBatches)
             {
                 List<Document> batchResults;
                 if (results.TryGetValue(batch.TargetTable.TableName, out batchResults))
@@ -269,14 +320,16 @@ internal void ExecuteHelper()
 #if AWS_ASYNC_API
         internal async Task ExecuteHelperAsync(CancellationToken cancellationToken)
         {
+            var errMsg = $"All {nameof(IDocumentBatchGet)} objects must be of type {nameof(DocumentBatchGet)}";
+            var docBatches = Batches.Select(x => x as DocumentBatchGet ?? throw new InvalidOperationException(errMsg)).ToList();
             MultiBatchGet resultsObject = new MultiBatchGet
             {
-                Batches = Batches
+                Batches = docBatches
             };
 
             var results = await resultsObject.GetItemsHelperAsync(cancellationToken).ConfigureAwait(false);
 
-            foreach (var batch in Batches)
+            foreach (var batch in docBatches)
             {
                 List<Document> batchResults;
                 if (results.TryGetValue(batch.TargetTable.TableName, out batchResults))
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentBatchWrite.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentBatchWrite.cs
index 2d4a4e882928..63122f863ab9 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentBatchWrite.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentBatchWrite.cs
@@ -15,21 +15,68 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
+using System.Linq;
 using System.Net;
 using System.Threading;
 #if AWS_ASYNC_API
 using System.Threading.Tasks;
 #endif
 using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
+    /// <summary>
+    /// Interface for putting and/or deleting a batch of items in a single DynamoDB table.
+    /// </summary>
+    public partial interface IDocumentBatchWrite
+    {
+        /// <summary>
+        /// Add a single item to delete, identified by its hash primary key.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to delete.</param>
+        void AddKeyToDelete(Primitive hashKey);
+
+        /// <summary>
+        /// Add a single item to delete, identified by its hash-and-range primary key.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to delete.</param>
+        /// <param name="rangeKey">Range key element of the item to delete.</param>
+        void AddKeyToDelete(Primitive hashKey, Primitive rangeKey);
+
+        /// <summary>
+        /// Add a single item to delete, identified by its key.
+        /// </summary>
+        /// <param name="key">Key of the item to delete.</param>
+        void AddKeyToDelete(IDictionary<string, DynamoDBEntry> key);
+
+        /// <summary>
+        /// Add a single item to delete, identified by a Document object.
+        /// </summary>
+        /// <param name="document">Document representing the item to be deleted.</param>
+        public void AddItemToDelete(Document document);
+
+        /// <summary>
+        /// Add a single Document to put.
+        /// </summary>
+        /// <param name="document">Document to put.</param>
+        void AddDocumentToPut(Document document);
+
+        /// <summary>
+        /// Creates a MultiTableDocumentBatchWrite object that is a combination
+        /// of the current DocumentBatchWrite and the specified DocumentBatchWrite.
+        /// </summary>
+        /// <param name="otherBatch">Other DocumentBatchWrite object.</param>
+        /// <returns>
+        /// MultiTableDocumentBatchWrite consisting of the two DocumentBatchWrite
+        /// objects.
+        /// </returns>
+        IMultiTableDocumentBatchWrite Combine(IDocumentBatchWrite otherBatch);
+    }
+
     /// <summary>
     /// Class for putting and/or deleting a batch of items in a single DynamoDB table.
     /// </summary>
-    public partial class DocumentBatchWrite
+    public partial class DocumentBatchWrite : IDocumentBatchWrite
     {
         #region Internal properties
 
@@ -58,38 +105,25 @@ public DocumentBatchWrite(Table targetTable)
 
         #region Public Delete methods
 
-        /// <summary>
-        /// Add a single item to delete, identified by its hash primary key.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to delete.</param>
+        /// <inheritdoc/>
         public void AddKeyToDelete(Primitive hashKey)
         {
             AddKeyToDelete(hashKey, null);
         }
 
-        /// <summary>
-        /// Add a single item to delete, identified by its hash-and-range primary key.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to delete.</param>
-        /// <param name="rangeKey">Range key element of the item to delete.</param>
+        /// <inheritdoc/>
         public void AddKeyToDelete(Primitive hashKey, Primitive rangeKey)
         {
             AddKeyToDelete(TargetTable.MakeKey(hashKey, rangeKey));
         }
 
-        /// <summary>
-        /// Add a single item to delete, identified by its key.
-        /// </summary>
-        /// <param name="key">Key of the item to delete.</param>
+        /// <inheritdoc/>
         public void AddKeyToDelete(IDictionary<string, DynamoDBEntry> key)
         {
             AddKeyToDelete(TargetTable.MakeKey(key));
         }
 
-        /// <summary>
-        /// Add a single item to delete, identified by a Document object.
-        /// </summary>
-        /// <param name="document">Document representing the item to be deleted.</param>
+        /// <inheritdoc/>
         public void AddItemToDelete(Document document)
         {
             AddKeyToDelete(TargetTable.MakeKey(document));
@@ -100,10 +134,7 @@ public void AddItemToDelete(Document document)
 
         #region Public Put methods
 
-        /// <summary>
-        /// Add a single Document to put.
-        /// </summary>
-        /// <param name="document">Document to put.</param>
+        /// <inheritdoc/>
         public void AddDocumentToPut(Document document)
         {
             ToPut.Add(document);
@@ -114,16 +145,8 @@ public void AddDocumentToPut(Document document)
 
         #region Public methods
 
-        /// <summary>
-        /// Creates a MultiTableDocumentBatchWrite object that is a combination
-        /// of the current DocumentBatchWrite and the specified DocumentBatchWrite.
-        /// </summary>
-        /// <param name="otherBatch">Other DocumentBatchWrite object.</param>
-        /// <returns>
-        /// MultiTableDocumentBatchWrite consisting of the two DocumentBatchWrite
-        /// objects.
-        /// </returns>
-        public MultiTableDocumentBatchWrite Combine(DocumentBatchWrite otherBatch)
+        /// <inheritdoc/>
+        public IMultiTableDocumentBatchWrite Combine(IDocumentBatchWrite otherBatch)
         {
             return new MultiTableDocumentBatchWrite(this, otherBatch);
         }
@@ -162,17 +185,32 @@ internal void AddKeyToDelete(Key key)
     }
 
     /// <summary>
-    /// Class for putting and/or deleting a batch of items in multiple DynamoDB tables.
+    /// Interface for putting and/or deleting a batch of items in multiple DynamoDB tables.
     /// </summary>
-    public partial class MultiTableDocumentBatchWrite
+    public partial interface IMultiTableDocumentBatchWrite
     {
-        #region Properties
-
         /// <summary>
         /// List of DocumentBatchWrite objects to include in the multi-table
         /// batch request.
         /// </summary>
-        public List<DocumentBatchWrite> Batches { get; private set; }
+        List<IDocumentBatchWrite> Batches { get; }
+
+        /// <summary>
+        /// Add a DocumentBatchWrite object to the multi-table batch request.
+        /// </summary>
+        /// <param name="batch">DocumentBatchWrite to add.</param>
+        void AddBatch(IDocumentBatchWrite batch);
+    }
+
+    /// <summary>
+    /// Class for putting and/or deleting a batch of items in multiple DynamoDB tables.
+    /// </summary>
+    public partial class MultiTableDocumentBatchWrite : IMultiTableDocumentBatchWrite
+    {
+        #region Properties
+
+        /// <inheritdoc/>
+        public List<IDocumentBatchWrite> Batches { get; private set; }
 
         #endregion
 
@@ -184,12 +222,12 @@ public partial class MultiTableDocumentBatchWrite
         /// DocumentBatchWrite objects.
         /// </summary>
         /// <param name="batches">Collection of DocumentBatchWrite objects.</param>
-        public MultiTableDocumentBatchWrite(params DocumentBatchWrite[] batches)
+        public MultiTableDocumentBatchWrite(params IDocumentBatchWrite[] batches)
         {
             if (batches == null)
                 throw new ArgumentNullException("batches");
 
-            Batches = new List<DocumentBatchWrite>(batches);
+            Batches = new List<IDocumentBatchWrite>(batches);
         }
 
         #endregion
@@ -197,11 +235,8 @@ public MultiTableDocumentBatchWrite(params DocumentBatchWrite[] batches)
 
         #region Public methods
 
-        /// <summary>
-        /// Add a DocumentBatchWrite object to the multi-table batch request.
-        /// </summary>
-        /// <param name="batch">DocumentBatchWrite to add.</param>
-        public void AddBatch(DocumentBatchWrite batch)
+        /// <inheritdoc/>
+        public void AddBatch(IDocumentBatchWrite batch)
         {
             Batches.Add(batch);
         }
@@ -213,9 +248,10 @@ public void AddBatch(DocumentBatchWrite batch)
 
         internal void ExecuteHelper()
         {
+            var errMsg = $"All {nameof(IDocumentBatchWrite)} objects must be of type {nameof(DocumentBatchWrite)}";
             MultiBatchWrite multiBatchWrite = new MultiBatchWrite
             {
-                Batches = Batches
+                Batches = Batches.Select(x => x as DocumentBatchWrite ?? throw new InvalidOperationException(errMsg)).ToList()
             };
             multiBatchWrite.WriteItems();
         }
@@ -223,9 +259,10 @@ internal void ExecuteHelper()
 #if AWS_ASYNC_API
         internal Task ExecuteHelperAsync(CancellationToken cancellationToken)
         {
+            var errMsg = $"All {nameof(IDocumentBatchWrite)} objects must be of type {nameof(DocumentBatchWrite)}";
             MultiBatchWrite multiBatchWrite = new MultiBatchWrite
             {
-                Batches = Batches
+                Batches = Batches.Select(x => x as DocumentBatchWrite ?? throw new InvalidOperationException(errMsg)).ToList()
             };
             return multiBatchWrite.WriteItemsAsync(cancellationToken);
         }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentTransactGet.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentTransactGet.cs
index 354b87c14a98..8a77e44bf89e 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentTransactGet.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentTransactGet.cs
@@ -27,7 +27,82 @@ namespace Amazon.DynamoDBv2.DocumentModel
     /// <summary>
     /// Class for retrieving multiple Documents from a single DynamoDB table in a transaction.
     /// </summary>
-    public partial class DocumentTransactGet
+    public partial interface IDocumentTransactGet
+    {
+        /// <summary>
+        /// List of results retrieved from DynamoDB.
+        /// Populated after Execute is called.
+        /// </summary>
+        List<Document> Results { get; }
+
+        /// <summary>
+        /// Add a single item to get, identified by its hash primary key,
+        /// using the specified expression to identify the attributes to retrieve.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to get.</param>
+        /// <param name="projectionExpression">
+        /// An expression that identifies one or more attributes of the specified item to retrieve from the table.
+        /// </param>
+        void AddKey(Primitive hashKey, Expression projectionExpression);
+
+        /// <summary>
+        /// Add a single item to get, identified by its hash primary key, using the specified config.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to get.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddKey(Primitive hashKey, TransactGetItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single item to get, identified by its hash-and-range primary key,
+        /// using the specified expression to identify the attributes to retrieve.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to get.</param>
+        /// <param name="rangeKey">Range key element of the item to get.</param>
+        /// <param name="projectionExpression">
+        /// An expression that identifies one or more attributes of the specified item to retrieve from the table.
+        /// </param>
+        void AddKey(Primitive hashKey, Primitive rangeKey, Expression projectionExpression);
+
+        /// <summary>
+        /// Add a single item to get, identified by its hash-and-range primary key, using the specified config.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to get.</param>
+        /// <param name="rangeKey">Range key element of the item to get.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddKey(Primitive hashKey, Primitive rangeKey, TransactGetItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single item to get, identified by its key,
+        /// using the specified expression to identify the attributes to retrieve.
+        /// </summary>
+        /// <param name="key">Key of the item to get.</param>
+        /// <param name="projectionExpression">
+        /// An expression that identifies one or more attributes of the specified item to retrieve from the table.
+        /// </param>
+        void AddKey(IDictionary<string, DynamoDBEntry> key, Expression projectionExpression);
+
+        /// <summary>
+        /// Add a single item to get, identified by its key, using the specified config.
+        /// </summary>
+        /// <param name="key">Key of the item to get.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddKey(IDictionary<string, DynamoDBEntry> key, TransactGetItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Creates a MultiTableDocumentTransactGet object that is a combination
+        /// of the current DocumentTransactGet and the specified DocumentTransactGet.
+        /// </summary>
+        /// <param name="otherTransactionPart">Other DocumentTransactGet object.</param>
+        /// <returns>
+        /// MultiTableDocumentTransactGet consisting of the two DocumentTransactGet objects.
+        /// </returns>
+        IMultiTableDocumentTransactGet Combine(IDocumentTransactGet otherTransactionPart);
+    }
+
+    /// <summary>
+    /// Class for retrieving multiple Documents from a single DynamoDB table in a transaction.
+    /// </summary>
+    public partial class DocumentTransactGet : IDocumentTransactGet
     {
         #region Internal properties
 
@@ -39,10 +114,7 @@ public partial class DocumentTransactGet
 
         #region Public properties
 
-        /// <summary>
-        /// List of results retrieved from DynamoDB.
-        /// Populated after Execute is called.
-        /// </summary>
+        /// <inheritdoc/>
         public List<Document> Results { get; internal set; }
 
         #endregion
@@ -65,86 +137,44 @@ public DocumentTransactGet(Table targetTable)
 
         #region Public methods
 
-        /// <summary>
-        /// Add a single item to get, identified by its hash primary key,
-        /// using the specified expression to identify the attributes to retrieve.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to get.</param>
-        /// <param name="projectionExpression">
-        /// An expression that identifies one or more attributes of the specified item to retrieve from the table.
-        /// </param>
+        /// <inheritdoc/>
         public void AddKey(Primitive hashKey, Expression projectionExpression)
         {
             AddKey(hashKey, new TransactGetItemOperationConfig { ProjectionExpression = projectionExpression });
         }
 
-        /// <summary>
-        /// Add a single item to get, identified by its hash primary key, using the specified config.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to get.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddKey(Primitive hashKey, TransactGetItemOperationConfig operationConfig = null)
         {
             AddKey(hashKey, rangeKey: null, operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to get, identified by its hash-and-range primary key,
-        /// using the specified expression to identify the attributes to retrieve.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to get.</param>
-        /// <param name="rangeKey">Range key element of the item to get.</param>
-        /// <param name="projectionExpression">
-        /// An expression that identifies one or more attributes of the specified item to retrieve from the table.
-        /// </param>
+        /// <inheritdoc/>
         public void AddKey(Primitive hashKey, Primitive rangeKey, Expression projectionExpression)
         {
             AddKey(hashKey, rangeKey, new TransactGetItemOperationConfig { ProjectionExpression = projectionExpression });
         }
 
-        /// <summary>
-        /// Add a single item to get, identified by its hash-and-range primary key, using the specified config.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to get.</param>
-        /// <param name="rangeKey">Range key element of the item to get.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddKey(Primitive hashKey, Primitive rangeKey, TransactGetItemOperationConfig operationConfig = null)
         {
             AddKeyHelper(TargetTable.MakeKey(hashKey, rangeKey), operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to get, identified by its key,
-        /// using the specified expression to identify the attributes to retrieve.
-        /// </summary>
-        /// <param name="key">Key of the item to get.</param>
-        /// <param name="projectionExpression">
-        /// An expression that identifies one or more attributes of the specified item to retrieve from the table.
-        /// </param>
+        /// <inheritdoc/>
         public void AddKey(IDictionary<string, DynamoDBEntry> key, Expression projectionExpression)
         {
             AddKey(key, new TransactGetItemOperationConfig { ProjectionExpression = projectionExpression });
         }
 
-        /// <summary>
-        /// Add a single item to get, identified by its key, using the specified config.
-        /// </summary>
-        /// <param name="key">Key of the item to get.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddKey(IDictionary<string, DynamoDBEntry> key, TransactGetItemOperationConfig operationConfig = null)
         {
             AddKeyHelper(TargetTable.MakeKey(key), operationConfig);
         }
 
-        /// <summary>
-        /// Creates a MultiTableDocumentTransactGet object that is a combination
-        /// of the current DocumentTransactGet and the specified DocumentTransactGet.
-        /// </summary>
-        /// <param name="otherTransactionPart">Other DocumentTransactGet object.</param>
-        /// <returns>
-        /// MultiTableDocumentTransactGet consisting of the two DocumentTransactGet objects.
-        /// </returns>
-        public MultiTableDocumentTransactGet Combine(DocumentTransactGet otherTransactionPart)
+        /// <inheritdoc/>
+        public IMultiTableDocumentTransactGet Combine(IDocumentTransactGet otherTransactionPart)
         {
             return new MultiTableDocumentTransactGet(this, otherTransactionPart);
         }
@@ -190,17 +220,32 @@ private MultiTransactGet GetMultiTransactGet()
     }
 
     /// <summary>
-    /// Class for retrieving multiple Documents from multiple DynamoDB tables in a transaction.
+    /// Interface for retrieving multiple Documents from multiple DynamoDB tables in a transaction.
     /// </summary>
-    public partial class MultiTableDocumentTransactGet
+    public partial interface IMultiTableDocumentTransactGet
     {
-        #region Properties
-
         /// <summary>
         /// List of DocumentTransactGet objects to include in the multi-table
         /// transaction request.
         /// </summary>
-        public List<DocumentTransactGet> TransactionParts { get; private set; }
+        List<IDocumentTransactGet> TransactionParts { get; }
+
+        /// <summary>
+        /// Add a DocumentTransactGet object to the multi-table transaction request.
+        /// </summary>
+        /// <param name="transactionPart">DocumentTransactGet to add.</param>
+        void AddTransactionPart(IDocumentTransactGet transactionPart);
+    }
+
+    /// <summary>
+    /// Class for retrieving multiple Documents from multiple DynamoDB tables in a transaction.
+    /// </summary>
+    public partial class MultiTableDocumentTransactGet : IMultiTableDocumentTransactGet
+    {
+        #region Properties
+
+        /// <inheritdoc/>
+        public List<IDocumentTransactGet> TransactionParts { get; private set; }
 
         #endregion
 
@@ -212,12 +257,12 @@ public partial class MultiTableDocumentTransactGet
         /// DocumentTransactGet objects.
         /// </summary>
         /// <param name="transactionParts">Collection of DocumentTransactGet objects.</param>
-        public MultiTableDocumentTransactGet(params DocumentTransactGet[] transactionParts)
+        public MultiTableDocumentTransactGet(params IDocumentTransactGet[] transactionParts)
         {
             if (transactionParts == null)
                 throw new ArgumentNullException(nameof(transactionParts));
 
-            TransactionParts = new List<DocumentTransactGet>(transactionParts);
+            TransactionParts = new List<IDocumentTransactGet>(transactionParts);
         }
 
         #endregion
@@ -225,11 +270,8 @@ public MultiTableDocumentTransactGet(params DocumentTransactGet[] transactionPar
 
         #region Public methods
 
-        /// <summary>
-        /// Add a DocumentTransactGet object to the multi-table transaction request.
-        /// </summary>
-        /// <param name="transactionPart">DocumentTransactGet to add.</param>
-        public void AddTransactionPart(DocumentTransactGet transactionPart)
+        /// <inheritdoc/>
+        public void AddTransactionPart(IDocumentTransactGet transactionPart)
         {
             TransactionParts.Add(transactionPart);
         }
@@ -242,11 +284,13 @@ public void AddTransactionPart(DocumentTransactGet transactionPart)
         internal void ExecuteHelper()
         {
             var items = GetMultiTransactGet().GetItems();
+            var errMsg = $"All transactionParts must be of type {nameof(DocumentTransactGet)}";
 
             foreach (var transactionPart in TransactionParts)
             {
-                items.TryGetValue(transactionPart, out var results);
-                transactionPart.Results = results ?? new List<Document>();
+                var docTransactGet = transactionPart as DocumentTransactGet ?? throw new InvalidOperationException(errMsg);
+                items.TryGetValue(docTransactGet, out var results);
+                docTransactGet.Results = results ?? new List<Document>();
             }
         }
 
@@ -254,20 +298,27 @@ internal void ExecuteHelper()
         internal async Task ExecuteHelperAsync(CancellationToken cancellationToken)
         {
             var items = await GetMultiTransactGet().GetItemsAsync(cancellationToken).ConfigureAwait(false);
+            var errMsg = $"All transactionParts must be of type {nameof(DocumentTransactGet)}";
 
             foreach (var transactionPart in TransactionParts)
             {
-                items.TryGetValue(transactionPart, out var results);
-                transactionPart.Results = results ?? new List<Document>();
+                var docTransactGet = transactionPart as DocumentTransactGet ?? throw new InvalidOperationException(errMsg);
+                items.TryGetValue(docTransactGet, out var results);
+                docTransactGet.Results = results ?? new List<Document>();
             }
         }
 #endif
 
         private MultiTransactGet GetMultiTransactGet()
         {
+            var errMsg = $"All transactionParts must be of type {nameof(DocumentTransactGet)}";
             return new MultiTransactGet
             {
-                Items = TransactionParts.SelectMany(x => x.Items).ToList()
+                Items = TransactionParts.SelectMany(x =>
+                {
+                    var docTransactGet = x as DocumentTransactGet ?? throw new InvalidOperationException(errMsg);
+                    return docTransactGet.Items;
+                }).ToList()
             };
         }
 
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentTransactWrite.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentTransactWrite.cs
index cff407032037..3ec32bd4c5b8 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentTransactWrite.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/DocumentTransactWrite.cs
@@ -24,6 +24,182 @@
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
+    /// <summary>
+    /// Interface for condition checking, putting, updating and/or deleting
+    /// multiple items in a single DynamoDB table in a transaction.
+    /// </summary>
+    public partial interface IDocumentTransactWrite
+    {
+        /// <summary>
+        /// List of items retrieved from DynamoDB for which a condition check failure happened.
+        /// Populated after Execute is called and a TransactionCanceledException happened due to a condition check failure.
+        /// A document is only added to this list if ReturnValuesOnConditionCheckFailure has been set to AllOldAttributes
+        /// for the corresponding item in the request.
+        /// </summary>
+        List<Document> ConditionCheckFailedItems { get; }
+
+        /// <summary>
+        /// Add a single item to delete, identified by its hash primary key, using the specified config.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to delete.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddKeyToDelete(Primitive hashKey, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single item to delete, identified by its hash-and-range primary key, using the specified config.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the item to delete.</param>
+        /// <param name="rangeKey">Range key element of the item to delete.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddKeyToDelete(Primitive hashKey, Primitive rangeKey, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single item to delete, identified by its key, using the specified config.
+        /// </summary>
+        /// <param name="key">Key of the item to delete.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddKeyToDelete(IDictionary<string, DynamoDBEntry> key, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single item to delete, identified by a Document object, using the specified config.
+        /// </summary>
+        /// <param name="document">Document representing the item to be deleted.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddItemToDelete(Document document, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single Document to update, identified by its hash primary key, using the specified config.
+        /// </summary>
+        /// <param name="document">Attributes to update.</param>
+        /// <param name="hashKey">Hash key of the document.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddDocumentToUpdate(Document document, Primitive hashKey, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single Document to update, identified by its hash-and-range primary key, using the specified config.
+        /// </summary>
+        /// <param name="document">Attributes to update.</param>
+        /// <param name="hashKey">Hash key of the document.</param>
+        /// <param name="rangeKey">Range key of the document.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddDocumentToUpdate(Document document, Primitive hashKey, Primitive rangeKey, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single Document to update, identified by its key, using the specified config.
+        /// </summary>
+        /// <param name="document">Attributes to update.</param>
+        /// <param name="key">Key of the document.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddDocumentToUpdate(Document document, IDictionary<string, DynamoDBEntry> key, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single Document to update, using the specified config.
+        /// </summary>
+        /// <param name="document">Document to update.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddDocumentToUpdate(Document document, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single item to update, identified by its hash primary key, using the specified update expression and config.
+        /// </summary>
+        /// <param name="hashKey">Hash key of the document.</param>
+        /// <param name="updateExpression">Update expression to use.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddDocumentToUpdate(Primitive hashKey, Expression updateExpression, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single item to update, identified by its hash-and-range primary key, using the specified update expression and config.
+        /// </summary>
+        /// <param name="hashKey">Hash key of the document.</param>
+        /// <param name="rangeKey">Range key of the document.</param>
+        /// <param name="updateExpression">Update expression to use.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddDocumentToUpdate(Primitive hashKey, Primitive rangeKey, Expression updateExpression, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single item to update, identified by its key, using the specified update expression and config.
+        /// </summary>
+        /// <param name="key">Key of the document.</param>
+        /// <param name="updateExpression">Update expression to use.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddDocumentToUpdate(IDictionary<string, DynamoDBEntry> key, Expression updateExpression, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single Document to put, using the specified config.
+        /// </summary>
+        /// <param name="document">Document to put.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddDocumentToPut(Document document, TransactWriteItemOperationConfig operationConfig = null);
+
+        /// <summary>
+        /// Add a single item to condition check, identified by its hash primary key, using the specified condition expression.
+        /// </summary>
+        /// <param name="hashKey">Hash key of the item.</param>
+        /// <param name="conditionalExpression">The expression to evaluate for the item.</param>
+        void AddKeyToConditionCheck(Primitive hashKey, Expression conditionalExpression);
+
+        /// <summary>
+        /// Add a single item to condition check, identified by its hash primary key, using the specified config.
+        /// </summary>
+        /// <param name="hashKey">Hash key of the item.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddKeyToConditionCheck(Primitive hashKey, TransactWriteItemOperationConfig operationConfig);
+
+        /// <summary>
+        /// Add a single item to condition check, identified by its hash-and-range primary key, using the specified condition expression.
+        /// </summary>
+        /// <param name="hashKey">Hash key of the item.</param>
+        /// <param name="rangeKey">Range key of the item.</param>
+        /// <param name="conditionalExpression">The expression to evaluate for the item.</param>
+        void AddKeyToConditionCheck(Primitive hashKey, Primitive rangeKey, Expression conditionalExpression);
+
+        /// <summary>
+        /// Add a single item to condition check, identified by its hash-and-range primary key, using the specified config.
+        /// </summary>
+        /// <param name="hashKey">Hash key of the item.</param>
+        /// <param name="rangeKey">Range key of the item.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddKeyToConditionCheck(Primitive hashKey, Primitive rangeKey, TransactWriteItemOperationConfig operationConfig);
+
+        /// <summary>
+        /// Add a single item to condition check, identified by its key, using the specified condition expression.
+        /// </summary>
+        /// <param name="key">Key of the item.</param>
+        /// <param name="conditionalExpression">The expression to evaluate for the item.</param>
+        void AddKeyToConditionCheck(IDictionary<string, DynamoDBEntry> key, Expression conditionalExpression);
+
+        /// <summary>
+        /// Add a single item to condition check, identified by its key, using the specified config.
+        /// </summary>
+        /// <param name="key">Key of the item.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddKeyToConditionCheck(IDictionary<string, DynamoDBEntry> key, TransactWriteItemOperationConfig operationConfig);
+
+        /// <summary>
+        /// Add a single item to condition check, identified by a Document object, using the specified condition expression.
+        /// </summary>
+        /// <param name="document">Document representing the item.</param>
+        /// <param name="conditionalExpression">The expression to evaluate for the item.</param>
+        void AddItemToConditionCheck(Document document, Expression conditionalExpression);
+
+        /// <summary>
+        ///  Add a single item to condition check, identified by a Document object, using the specified config.
+        /// </summary>
+        /// <param name="document">Document representing the item.</param>
+        /// <param name="operationConfig">Configuration to use.</param>
+        void AddItemToConditionCheck(Document document, TransactWriteItemOperationConfig operationConfig);
+
+        /// <summary>
+        /// Creates a MultiTableDocumentTransactWrite object that is a combination
+        /// of the current DocumentTransactWrite and the specified DocumentTransactWrite.
+        /// </summary>
+        /// <param name="otherTransactionPart">Other DocumentTransactWrite object.</param>
+        /// <returns>
+        /// MultiTableDocumentTransactWrite consisting of the two DocumentTransactWrite objects.
+        /// </returns>
+        IMultiTableDocumentTransactWrite Combine(IDocumentTransactWrite otherTransactionPart);
+    }
+
     /// <summary>
     /// Class for condition checking, putting, updating and/or deleting
     /// multiple items in a single DynamoDB table in a transaction.
@@ -31,7 +207,7 @@ namespace Amazon.DynamoDBv2.DocumentModel
 #if NET8_0_OR_GREATER
     [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode(Amazon.DynamoDBv2.Custom.Internal.InternalConstants.RequiresUnreferencedCodeMessage)]
 #endif
-    public partial class DocumentTransactWrite
+    public partial class DocumentTransactWrite : IDocumentTransactWrite
     {
         #region Internal properties
 
@@ -43,12 +219,7 @@ public partial class DocumentTransactWrite
 
         #region Public properties
 
-        /// <summary>
-        /// List of items retrieved from DynamoDB for which a condition check failure happened.
-        /// Populated after Execute is called and a TransactionCanceledException happened due to a condition check failure.
-        /// A document is only added to this list if ReturnValuesOnConditionCheckFailure has been set to AllOldAttributes
-        /// for the corresponding item in the request.
-        /// </summary>
+        /// <inheritdoc/>
         public List<Document> ConditionCheckFailedItems { get; internal set; }
 
         #endregion
@@ -56,10 +227,7 @@ public partial class DocumentTransactWrite
 
         #region Constructor
 
-        /// <summary>
-        /// Constructs a DocumentTransactWrite instance for a specific table.
-        /// </summary>
-        /// <param name="targetTable">Table to get items from.</param>
+        /// <inheritdoc/>
         public DocumentTransactWrite(Table targetTable)
         {
             TargetTable = targetTable;
@@ -71,42 +239,25 @@ public DocumentTransactWrite(Table targetTable)
 
         #region Public Delete methods
 
-        /// <summary>
-        /// Add a single item to delete, identified by its hash primary key, using the specified config.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to delete.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddKeyToDelete(Primitive hashKey, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddKeyToDelete(hashKey, rangeKey: null, operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to delete, identified by its hash-and-range primary key, using the specified config.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the item to delete.</param>
-        /// <param name="rangeKey">Range key element of the item to delete.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddKeyToDelete(Primitive hashKey, Primitive rangeKey, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddKeyToDeleteHelper(TargetTable.MakeKey(hashKey, rangeKey), operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to delete, identified by its key, using the specified config.
-        /// </summary>
-        /// <param name="key">Key of the item to delete.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddKeyToDelete(IDictionary<string, DynamoDBEntry> key, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddKeyToDeleteHelper(TargetTable.MakeKey(key), operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to delete, identified by a Document object, using the specified config.
-        /// </summary>
-        /// <param name="document">Document representing the item to be deleted.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddItemToDelete(Document document, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddKeyToDeleteHelper(TargetTable.MakeKey(document), operationConfig);
@@ -117,79 +268,43 @@ public void AddItemToDelete(Document document, TransactWriteItemOperationConfig
 
         #region Public Update methods
 
-        /// <summary>
-        /// Add a single Document to update, identified by its hash primary key, using the specified config.
-        /// </summary>
-        /// <param name="document">Attributes to update.</param>
-        /// <param name="hashKey">Hash key of the document.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddDocumentToUpdate(Document document, Primitive hashKey, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddDocumentToUpdate(document, hashKey, rangeKey: null, operationConfig);
         }
 
-        /// <summary>
-        /// Add a single Document to update, identified by its hash-and-range primary key, using the specified config.
-        /// </summary>
-        /// <param name="document">Attributes to update.</param>
-        /// <param name="hashKey">Hash key of the document.</param>
-        /// <param name="rangeKey">Range key of the document.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddDocumentToUpdate(Document document, Primitive hashKey, Primitive rangeKey, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddDocumentToUpdateHelper(document, TargetTable.MakeKey(hashKey, rangeKey), operationConfig);
         }
 
-        /// <summary>
-        /// Add a single Document to update, identified by its key, using the specified config.
-        /// </summary>
-        /// <param name="document">Attributes to update.</param>
-        /// <param name="key">Key of the document.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddDocumentToUpdate(Document document, IDictionary<string, DynamoDBEntry> key, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddDocumentToUpdateHelper(document, TargetTable.MakeKey(key), operationConfig);
         }
 
-        /// <summary>
-        /// Add a single Document to update, using the specified config.
-        /// </summary>
-        /// <param name="document">Document to update.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddDocumentToUpdate(Document document, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddDocumentToUpdateHelper(document, TargetTable.MakeKey(document), operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to update, identified by its hash primary key, using the specified update expression and config.
-        /// </summary>
-        /// <param name="hashKey">Hash key of the document.</param>
-        /// <param name="updateExpression">Update expression to use.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddDocumentToUpdate(Primitive hashKey, Expression updateExpression, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddDocumentToUpdate(hashKey, rangeKey: null, updateExpression, operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to update, identified by its hash-and-range primary key, using the specified update expression and config.
-        /// </summary>
-        /// <param name="hashKey">Hash key of the document.</param>
-        /// <param name="rangeKey">Range key of the document.</param>
-        /// <param name="updateExpression">Update expression to use.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddDocumentToUpdate(Primitive hashKey, Primitive rangeKey, Expression updateExpression, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddDocumentToUpdateHelper(TargetTable.MakeKey(hashKey, rangeKey), updateExpression, operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to update, identified by its key, using the specified update expression and config.
-        /// </summary>
-        /// <param name="key">Key of the document.</param>
-        /// <param name="updateExpression">Update expression to use.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddDocumentToUpdate(IDictionary<string, DynamoDBEntry> key, Expression updateExpression, TransactWriteItemOperationConfig operationConfig = null)
         {
             AddDocumentToUpdateHelper(TargetTable.MakeKey(key), updateExpression, operationConfig);
@@ -200,11 +315,7 @@ public void AddDocumentToUpdate(IDictionary<string, DynamoDBEntry> key, Expressi
 
         #region Public Put methods
 
-        /// <summary>
-        /// Add a single Document to put, using the specified config.
-        /// </summary>
-        /// <param name="document">Document to put.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddDocumentToPut(Document document, TransactWriteItemOperationConfig operationConfig = null)
         {
             Items.Add(new ToPutTransactWriteRequestItem
@@ -220,83 +331,49 @@ public void AddDocumentToPut(Document document, TransactWriteItemOperationConfig
 
         #region Public ConditionCheck methods
 
-        /// <summary>
-        /// Add a single item to condition check, identified by its hash primary key, using the specified condition expression.
-        /// </summary>
-        /// <param name="hashKey">Hash key of the item.</param>
-        /// <param name="conditionalExpression">The expression to evaluate for the item.</param>
+        /// <inheritdoc/>
         public void AddKeyToConditionCheck(Primitive hashKey, Expression conditionalExpression)
         {
             AddKeyToConditionCheck(hashKey, new TransactWriteItemOperationConfig { ConditionalExpression = conditionalExpression });
         }
 
-        /// <summary>
-        /// Add a single item to condition check, identified by its hash primary key, using the specified config.
-        /// </summary>
-        /// <param name="hashKey">Hash key of the item.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddKeyToConditionCheck(Primitive hashKey, TransactWriteItemOperationConfig operationConfig)
         {
             AddKeyToConditionCheck(hashKey, rangeKey: null, operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to condition check, identified by its hash-and-range primary key, using the specified condition expression.
-        /// </summary>
-        /// <param name="hashKey">Hash key of the item.</param>
-        /// <param name="rangeKey">Range key of the item.</param>
-        /// <param name="conditionalExpression">The expression to evaluate for the item.</param>
+        /// <inheritdoc/>
         public void AddKeyToConditionCheck(Primitive hashKey, Primitive rangeKey, Expression conditionalExpression)
         {
             AddKeyToConditionCheck(hashKey, rangeKey, new TransactWriteItemOperationConfig { ConditionalExpression = conditionalExpression });
         }
 
-        /// <summary>
-        /// Add a single item to condition check, identified by its hash-and-range primary key, using the specified config.
-        /// </summary>
-        /// <param name="hashKey">Hash key of the item.</param>
-        /// <param name="rangeKey">Range key of the item.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddKeyToConditionCheck(Primitive hashKey, Primitive rangeKey, TransactWriteItemOperationConfig operationConfig)
         {
             AddKeyToConditionCheckHelper(TargetTable.MakeKey(hashKey, rangeKey), operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to condition check, identified by its key, using the specified condition expression.
-        /// </summary>
-        /// <param name="key">Key of the item.</param>
-        /// <param name="conditionalExpression">The expression to evaluate for the item.</param>
+        /// <inheritdoc/>
         public void AddKeyToConditionCheck(IDictionary<string, DynamoDBEntry> key, Expression conditionalExpression)
         {
             AddKeyToConditionCheck(key, new TransactWriteItemOperationConfig { ConditionalExpression = conditionalExpression });
         }
 
-        /// <summary>
-        /// Add a single item to condition check, identified by its key, using the specified config.
-        /// </summary>
-        /// <param name="key">Key of the item.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddKeyToConditionCheck(IDictionary<string, DynamoDBEntry> key, TransactWriteItemOperationConfig operationConfig)
         {
             AddKeyToConditionCheckHelper(TargetTable.MakeKey(key), operationConfig);
         }
 
-        /// <summary>
-        /// Add a single item to condition check, identified by a Document object, using the specified condition expression.
-        /// </summary>
-        /// <param name="document">Document representing the item.</param>
-        /// <param name="conditionalExpression">The expression to evaluate for the item.</param>
+        /// <inheritdoc/>
         public void AddItemToConditionCheck(Document document, Expression conditionalExpression)
         {
             AddItemToConditionCheck(document, new TransactWriteItemOperationConfig { ConditionalExpression = conditionalExpression });
         }
 
-        /// <summary>
-        ///  Add a single item to condition check, identified by a Document object, using the specified config.
-        /// </summary>
-        /// <param name="document">Document representing the item.</param>
-        /// <param name="operationConfig">Configuration to use.</param>
+        /// <inheritdoc/>
         public void AddItemToConditionCheck(Document document, TransactWriteItemOperationConfig operationConfig)
         {
             AddKeyToConditionCheckHelper(TargetTable.MakeKey(document), operationConfig);
@@ -451,15 +528,8 @@ private static bool TryFilterDuplicates<T>(Dictionary<string, T> src, Dictionary
 
         #region Public methods
 
-        /// <summary>
-        /// Creates a MultiTableDocumentTransactWrite object that is a combination
-        /// of the current DocumentTransactWrite and the specified DocumentTransactWrite.
-        /// </summary>
-        /// <param name="otherTransactionPart">Other DocumentTransactWrite object.</param>
-        /// <returns>
-        /// MultiTableDocumentTransactWrite consisting of the two DocumentTransactWrite objects.
-        /// </returns>
-        public MultiTableDocumentTransactWrite Combine(DocumentTransactWrite otherTransactionPart)
+        /// <inheritdoc/>
+        public IMultiTableDocumentTransactWrite Combine(IDocumentTransactWrite otherTransactionPart)
         {
             return new MultiTableDocumentTransactWrite(this, otherTransactionPart);
         }
@@ -468,18 +538,34 @@ public MultiTableDocumentTransactWrite Combine(DocumentTransactWrite otherTransa
     }
 
     /// <summary>
-    /// Class for condition checking, putting, updating and/or deleting
+    /// Interface for condition checking, putting, updating and/or deleting
     /// multiple items in multiple DynamoDB tables in a transaction.
     /// </summary>
-    public partial class MultiTableDocumentTransactWrite
+    public partial interface IMultiTableDocumentTransactWrite
     {
-        #region Properties
-
         /// <summary>
         /// List of DocumentTransactWrite objects to include in the multi-table
         /// transaction request.
         /// </summary>
-        public List<DocumentTransactWrite> TransactionParts { get; private set; }
+        List<IDocumentTransactWrite> TransactionParts { get; }
+
+        /// <summary>
+        /// Add a DocumentTransactWrite object to the multi-table transaction request.
+        /// </summary>
+        /// <param name="transactionPart">DocumentTransactWrite to add.</param>
+        void AddTransactionPart(IDocumentTransactWrite transactionPart);
+    }
+
+    /// <summary>
+    /// Class for condition checking, putting, updating and/or deleting
+    /// multiple items in multiple DynamoDB tables in a transaction.
+    /// </summary>
+    public partial class MultiTableDocumentTransactWrite : IMultiTableDocumentTransactWrite
+    {
+        #region Properties
+
+        /// <inheritdoc/>
+        public List<IDocumentTransactWrite> TransactionParts { get; private set; }
 
         #endregion
 
@@ -491,12 +577,12 @@ public partial class MultiTableDocumentTransactWrite
         /// DocumentTransactWrite objects.
         /// </summary>
         /// <param name="transactionParts">Collection of DocumentTransactWrite objects.</param>
-        public MultiTableDocumentTransactWrite(params DocumentTransactWrite[] transactionParts)
+        public MultiTableDocumentTransactWrite(params IDocumentTransactWrite[] transactionParts)
         {
             if (transactionParts == null)
                 throw new ArgumentNullException(nameof(transactionParts));
 
-            TransactionParts = new List<DocumentTransactWrite>(transactionParts);
+            TransactionParts = new List<IDocumentTransactWrite>(transactionParts);
         }
 
         #endregion
@@ -504,11 +590,8 @@ public MultiTableDocumentTransactWrite(params DocumentTransactWrite[] transactio
 
         #region Public methods
 
-        /// <summary>
-        /// Add a DocumentTransactWrite object to the multi-table transaction request.
-        /// </summary>
-        /// <param name="transactionPart">DocumentTransactWrite to add.</param>
-        public void AddTransactionPart(DocumentTransactWrite transactionPart)
+        /// <inheritdoc/>
+        public void AddTransactionPart(IDocumentTransactWrite transactionPart)
         {
             TransactionParts.Add(transactionPart);
         }
@@ -520,13 +603,16 @@ public void AddTransactionPart(DocumentTransactWrite transactionPart)
 
         internal void ExecuteHelper()
         {
+            List<DocumentTransactWrite> docTransactionParts = new();
             try
             {
                 GetMultiTransactWrite().WriteItems();
+                var errMsg = $"All transaction parts must be of type {nameof(DocumentTransactWrite)}";
+                docTransactionParts = TransactionParts.Select(x => x as DocumentTransactWrite ?? throw new InvalidOperationException(errMsg)).ToList();
             }
             finally
             {
-                foreach (var transactionPart in TransactionParts)
+                foreach (var transactionPart in docTransactionParts)
                 {
                     if (transactionPart.ConditionCheckFailedItems == null)
                         transactionPart.ConditionCheckFailedItems = new List<Document>();
@@ -537,13 +623,16 @@ internal void ExecuteHelper()
 #if AWS_ASYNC_API
         internal async Task ExecuteHelperAsync(CancellationToken cancellationToken)
         {
+            List<DocumentTransactWrite> docTransactionParts = new();
             try
             {
                 await GetMultiTransactWrite().WriteItemsAsync(cancellationToken).ConfigureAwait(false);
+                var errMsg = $"All transaction parts must be of type {nameof(DocumentTransactWrite)}";
+                docTransactionParts = TransactionParts.Select(x => x as DocumentTransactWrite ?? throw new InvalidOperationException(errMsg)).ToList();
             }
             finally
             {
-                foreach (var transactionPart in TransactionParts)
+                foreach (var transactionPart in docTransactionParts)
                 {
                     if (transactionPart.ConditionCheckFailedItems == null)
                         transactionPart.ConditionCheckFailedItems = new List<Document>();
@@ -554,9 +643,14 @@ internal async Task ExecuteHelperAsync(CancellationToken cancellationToken)
 
         private MultiTransactWrite GetMultiTransactWrite()
         {
+            var errMsg = $"All transaction parts must be of type {nameof(DocumentTransactWrite)}";
             return new MultiTransactWrite
             {
-                Items = TransactionParts.SelectMany(x => x.Items).ToList()
+                Items = TransactionParts.SelectMany(x =>
+                {
+                    var docTransactWrite = x as DocumentTransactWrite ?? throw new InvalidOperationException(errMsg);
+                    return docTransactWrite.Items;
+                }).ToList()
             };
         }
 
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/Search.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/Search.cs
index 6eaef4a68e37..5a1ef0114715 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/Search.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/Search.cs
@@ -18,7 +18,6 @@
 using System.Linq;
 
 using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
 using System.Globalization;
 #if AWS_ASYNC_API
 using System.Threading.Tasks;
@@ -28,41 +27,20 @@
 namespace Amazon.DynamoDBv2.DocumentModel
 {
     /// <summary>
-    /// Search response object
+    /// Represents the interface for a search response
     /// </summary>
-#if NET8_0_OR_GREATER
-    [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode(Amazon.DynamoDBv2.Custom.Internal.InternalConstants.RequiresUnreferencedCodeMessage)]
-#endif
-    public partial class Search
+    public partial interface ISearch
     {
-        #region Internal constructors
-
-        internal Search()
-            : this((SearchType)0)
-        {
-        }
-
-        internal Search(SearchType searchMethod)
-        {
-            SearchMethod = searchMethod;
-            Reset();
-        }
-
-        #endregion
-
-
-        #region Public properties
-
         /// <summary>
         /// Name of the table being searched
         /// </summary>
-        public String TableName { get; internal set; }
+        string TableName { get; }
 
         /// <summary>
         /// Whether to collect GetNextSet and GetRemaining results in Matches property.
         /// Default is true. If set to false, Matches will always be empty.
         /// </summary>
-        public bool CollectResults { get; internal set; }
+        bool CollectResults { get; }
 
         /// <summary>
         /// Upper limit on the number of items returned.
@@ -71,77 +49,67 @@ internal Search(SearchType searchMethod)
         /// 
         /// Maps directly to Limit property on Query and Scan operations.
         /// </summary>
-        public int Limit { get; internal set; }
+        int Limit { get; }
 
         /// <summary>
         /// The key expression that is evaluated for each item of a query.
         /// This applies only to Query operations.
         /// </summary>
-        public Expression KeyExpression { get; set; }
+        Expression KeyExpression { get; set; }
 
         /// <summary>
         /// The filter expression that is evaluated for each item.
         /// This applies to Query and Scan operations.
         /// </summary>
-        public Expression FilterExpression { get; set; }
+        Expression FilterExpression { get; set; }
 
         /// <summary>
         /// Filter for the search operation
         /// This applies to Query and Scan operations.
         /// </summary>
-        public Filter Filter { get; internal set; }
+        Filter Filter { get; }
 
         /// <summary>
         /// Conditional operator for the search operation
         /// </summary>
-        public ConditionalOperatorValues ConditionalOperator { get; internal set; }
+        ConditionalOperatorValues ConditionalOperator { get; }
 
         /// <summary>
         /// List of attribute names to retrieve
         /// </summary>
-        public List<String> AttributesToGet { get; internal set; }
+        List<String> AttributesToGet { get; }
 
         /// <summary>
         /// Flag that, if true, indicates that the search is operating in consistent-read mode
         /// </summary>
-        public bool IsConsistentRead { get; internal set; }
+        bool IsConsistentRead { get; }
 
         /// <summary>
         /// Flag that, if true, indicates that the search is traversing backwards
         /// </summary>
-        public bool IsBackwardSearch { get; internal set; }
+        bool IsBackwardSearch { get; }
 
         /// <summary>
         /// Flag that, if true, indicates that the search is done
         /// </summary>
-        public bool IsDone { get; private set; }
+        bool IsDone { get; }
 
         /// <summary>
         /// Key denoting the starting point of the next set of results
         /// </summary>
-        public Dictionary<string, AttributeValue> NextKey { get; private set; }
+        Dictionary<string, AttributeValue> NextKey { get; }
 
         /// <summary>
         /// Pagination token corresponding to the item where the search operation stopped,
         /// inclusive of the previous result set. Use this value to start a new
         /// operation to resume search from the next item.
         /// </summary>
-        public string PaginationToken
-        {
-            get
-            {
-                return Common.ToPaginationToken(NextKey);
-            }
-            internal set
-            {
-                NextKey = Common.FromPaginationToken(value);
-            }
-        }
+        string PaginationToken { get; }
 
         /// <summary>
         /// List of currently found items
         /// </summary>
-        public List<Document> Matches { get; private set; }
+        List<Document> Matches { get; }
 
         /// <summary>
         /// For parallel <i>Scan</i> requests, <i>TotalSegments</i>represents the total number of segments for a table that is being scanned. Segments
@@ -162,7 +130,7 @@ internal set
         /// </list>
         /// </para>
         /// </summary>
-        public int TotalSegments { get; set; }
+        int TotalSegments { get; set; }
 
         /// <summary>
         /// For parallel <i>Scan</i> requests, <i>Segment</i> identifies an individual segment to be scanned by an application "worker" (such as a
@@ -182,7 +150,7 @@ internal set
         /// </list>
         /// </para>
         /// </summary>
-        public int Segment { get; set; }
+        int Segment { get; set; }
 
         /// <summary>
         /// Gets the total number of items that match the search parameters.
@@ -191,16 +159,110 @@ internal set
         /// Otherwise, makes a call to DynamoDB to find out the number of
         /// matching items, without retrieving the items. Count is then cached.
         /// </summary>
-        public int Count { get { return GetCount(); } }
+        int Count { get; }
 
         /// <summary>
         /// Name of the index to query or scan against.
         /// </summary>
-        public string IndexName { get; internal set; }
+        string IndexName { get; }
 
         /// <summary>
         /// Enum specifying what data to return from query.
         /// </summary>
+        SelectValues Select { get; }
+    }
+
+    /// <summary>
+    /// Search response object
+    /// </summary>
+#if NET8_0_OR_GREATER
+    [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode(Amazon.DynamoDBv2.Custom.Internal.InternalConstants.RequiresUnreferencedCodeMessage)]
+#endif
+    public partial class Search : ISearch
+    {
+        #region Internal constructors
+
+        internal Search()
+            : this((SearchType)0)
+        {
+        }
+
+        internal Search(SearchType searchMethod)
+        {
+            SearchMethod = searchMethod;
+            Reset();
+        }
+
+        #endregion
+
+
+        #region Public properties
+
+        /// <inheritdoc/>
+        public string TableName { get; internal set; }
+
+        /// <inheritdoc/>
+        public bool CollectResults { get; internal set; }
+
+        /// <inheritdoc/>
+        public int Limit { get; internal set; }
+
+        /// <inheritdoc/>
+        public Expression KeyExpression { get; set; }
+
+        /// <inheritdoc/>
+        public Expression FilterExpression { get; set; }
+
+        /// <inheritdoc/>
+        public Filter Filter { get; internal set; }
+
+        /// <inheritdoc/>
+        public ConditionalOperatorValues ConditionalOperator { get; internal set; }
+
+        /// <inheritdoc/>
+        public List<String> AttributesToGet { get; internal set; }
+
+        /// <inheritdoc/>
+        public bool IsConsistentRead { get; internal set; }
+
+        /// <inheritdoc/>
+        public bool IsBackwardSearch { get; internal set; }
+
+        /// <inheritdoc/>
+        public bool IsDone { get; private set; }
+
+        /// <inheritdoc/>
+        public Dictionary<string, AttributeValue> NextKey { get; private set; }
+
+        /// <inheritdoc/>
+        public string PaginationToken
+        {
+            get
+            {
+                return Common.ToPaginationToken(NextKey);
+            }
+            internal set
+            {
+                NextKey = Common.FromPaginationToken(value);
+            }
+        }
+
+        /// <inheritdoc/>
+        public List<Document> Matches { get; private set; }
+
+        /// <inheritdoc/>
+        public int TotalSegments { get; set; }
+
+        /// <inheritdoc/>
+        public int Segment { get; set; }
+
+        /// <inheritdoc/>
+        public int Count { get { return GetCount(); } }
+
+        /// <inheritdoc/>
+        public string IndexName { get; internal set; }
+
+        /// <inheritdoc/>
         public SelectValues Select { get; internal set; }
 
         #endregion
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/Table.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/Table.cs
index 17c04ce926c9..7c67a4b0a281 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/Table.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/Table.cs
@@ -30,6 +30,221 @@
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
+    /// <summary>
+    /// This represents the table interface when using the Document API. It is used to Get documents from the DynamoDB table
+    /// and write documents back to the DynamoDB table.
+    /// </summary>
+    public partial interface ITable
+    {
+        #region Public properties
+
+        /// <summary>
+        /// Name of the table.
+        /// </summary>
+        string TableName { get; }
+
+        /// <summary>
+        /// Keys of the table.
+        /// </summary>
+        Dictionary<string, KeyDescription> Keys { get; }
+
+        /// <summary>
+        /// Global secondary indexes of the table.
+        /// </summary>
+        Dictionary<string, GlobalSecondaryIndexDescription> GlobalSecondaryIndexes { get; }
+
+        /// <summary>
+        /// Local secondary indexes of the table.
+        /// </summary>
+        Dictionary<string, LocalSecondaryIndexDescription> LocalSecondaryIndexes { get; }
+
+        /// <summary>
+        /// Names of the local secondary indexes of the table.
+        /// </summary>
+        List<string> LocalSecondaryIndexNames { get; }
+
+        /// <summary>
+        /// Names of the global secondary indexes of the table.
+        /// </summary>
+        List<string> GlobalSecondaryIndexNames { get; }
+
+        /// <summary>
+        /// List of keys on the table marked HASH
+        /// </summary>
+        List<string> HashKeys { get; }
+
+        /// <summary>
+        /// List of keys on the table marked RANGE
+        /// </summary>
+        List<string> RangeKeys { get; }
+
+        /// <summary>
+        /// List of key attributes on the table.
+        /// </summary>
+        public List<AttributeDefinition> Attributes { get; set; }
+
+        #endregion
+
+        #region Conversion methods
+
+        /// <summary>
+        /// Creates a Document from an attribute map.
+        /// </summary>
+        /// <param name="data">Map of attribute names to attribute values.</param>
+        /// <returns>Document representing the data.</returns>
+        Document FromAttributeMap(Dictionary<string, AttributeValue> data);
+
+        /// <summary>
+        /// Creates a map of attribute names mapped to AttributeValue objects.
+        /// Converts .NET types using the conversion specified in this Table.
+        /// </summary>
+        /// <returns></returns>
+        Dictionary<string, AttributeValue> ToAttributeMap(Document doc);
+
+        /// <summary>
+        /// Creates a map of attribute names mapped to ExpectedAttributeValue objects.
+        /// </summary>
+        /// <returns></returns>
+        Dictionary<string, ExpectedAttributeValue> ToExpectedAttributeMap(Document doc);
+
+        /// <summary>
+        /// Creates a map of attribute names mapped to AttributeValueUpdate objects.
+        /// </summary>
+        /// <param name="doc"></param>
+        /// <param name="changedAttributesOnly">If true, only attributes that have been changed will be in the map.</param>
+        /// <returns></returns>
+        Dictionary<string, AttributeValueUpdate> ToAttributeUpdateMap(Document doc, bool changedAttributesOnly);
+
+
+        #endregion
+
+        #region Scan
+
+        /// <summary>
+        /// Initiates a Search object to Scan a DynamoDB table, with the
+        /// specified filter.
+        /// 
+        /// No calls are made until the Search object is used.
+        /// </summary>
+        /// <param name="filter">Filter to apply to the scan.</param>
+        /// <returns>Resultant Search container.</returns>
+        ISearch Scan(ScanFilter filter);
+
+        /// <summary>
+        /// Initiates a Search object to Scan a DynamoDB table, with the
+        /// specified expression.
+        /// 
+        /// No calls are made until the Search object is used.
+        /// </summary>
+        /// <param name="filterExpression">Expression to apply to the scan.</param>
+        /// <returns>Resultant Search container.</returns>
+        ISearch Scan(Expression filterExpression);
+
+
+        /// <summary>
+        /// Initiates a Search object to Scan a DynamoDB table, with the
+        /// specified config.
+        /// 
+        /// No calls are made until the Search object is used.
+        /// </summary>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>Resultant Search container.</returns>
+        ISearch Scan(ScanOperationConfig config);
+
+        #endregion
+
+        #region Query
+
+        /// <summary>
+        /// Initiates a Search object to Query a DynamoDB table, with the
+        /// specified hash primary key and filter.
+        /// 
+        /// No calls are made until the Search object is used.
+        /// </summary>
+        /// <param name="hashKey">Value of the hash key for the query operation.</param>
+        /// <param name="filter">Filter to use.</param>
+        /// <returns>Resultant Search container.</returns>
+        ISearch Query(Primitive hashKey, QueryFilter filter);
+
+
+        /// <summary>
+        /// Initiates a Search object to Query a DynamoDB table, with the
+        /// specified hash primary key and expression.
+        /// 
+        /// No calls are made until the Search object is used.
+        /// </summary>
+        /// <param name="hashKey">Value of the hash key for the query operation.</param>
+        /// <param name="filterExpression">Expression to use.</param>
+        /// <returns>Resultant Search container.</returns>
+        ISearch Query(Primitive hashKey, Expression filterExpression);
+
+        /// <summary>
+        /// Initiates a Search object to Query a DynamoDB table, with the
+        /// specified filter.
+        /// 
+        /// No calls are made until the Search object is used.
+        /// </summary>
+        /// <param name="filter">Filter to use.</param>
+        /// <returns>Resultant Search container.</returns>
+        ISearch Query(QueryFilter filter);
+
+        /// <summary>
+        /// Initiates a Search object to Query a DynamoDB table, with the
+        /// specified config.
+        /// 
+        /// No calls are made until the Search object is used.
+        /// </summary>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>Resultant Search container.</returns>
+        ISearch Query(QueryOperationConfig config);
+
+        #endregion
+
+        #region BatchGet
+
+        /// <summary>
+        /// Creates a DocumentBatchGet object for the current table, allowing
+        /// a batch-get operation against DynamoDB.
+        /// </summary>
+        /// <returns>Empty DocumentBatchGet object.</returns>
+        IDocumentBatchGet CreateBatchGet();
+
+        #endregion
+
+        #region BatchWrite
+
+        /// <summary>
+        /// Creates a DocumentBatchWrite object for the current table, allowing
+        /// a batch-put/delete operation against DynamoDB.
+        /// </summary>
+        /// <returns>Empty DocumentBatchWrite object.</returns>
+        IDocumentBatchWrite CreateBatchWrite();
+
+        #endregion
+
+        #region TransactGet
+
+        /// <summary>
+        /// Creates a DocumentTransactGet object for the current table, allowing
+        /// a transactional get operation against DynamoDB.
+        /// </summary>
+        /// <returns>Empty DocumentTransactGet object.</returns>
+        IDocumentTransactGet CreateTransactGet();
+
+        #endregion
+
+        #region TransactWrite
+
+        /// <summary>
+        /// Creates a DocumentTransactWrite object for the current table, allowing
+        /// a transactional condition-check/put/update/delete operation against DynamoDB.
+        /// </summary>
+        /// <returns>Empty DocumentTransactWrite object.</returns>
+        IDocumentTransactWrite CreateTransactWrite();
+
+        #endregion
+    }
+
     /// <summary>
     /// The Table class is the starting object when using the Document API. It is used to Get documents from the DynamoDB table
     /// and write documents back to the DynamoDB table.
@@ -37,7 +252,7 @@ namespace Amazon.DynamoDBv2.DocumentModel
 #if NET8_0_OR_GREATER
     [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode(Amazon.DynamoDBv2.Custom.Internal.InternalConstants.RequiresUnreferencedCodeMessage)]
 #endif
-    public partial class Table
+    public partial class Table : ITable
     {
         #region Private/internal members
 
@@ -60,49 +275,31 @@ internal enum DynamoDBConsumer
 
         #region Public properties
 
-        /// <summary>
-        /// Name of the table.
-        /// </summary>
+        /// <inheritdoc/>
         public string TableName { get { return Config.TableName; } }
 
-        /// <summary>
-        /// Keys of the table.
-        /// </summary>
+        /// <inheritdoc/>
         public Dictionary<string, KeyDescription> Keys { get; private set; }
 
-        /// <summary>
-        /// Global secondary indexes of the table.
-        /// </summary>
+        /// <inheritdoc/>
         public Dictionary<string, GlobalSecondaryIndexDescription> GlobalSecondaryIndexes { get; private set; }
 
-        /// <summary>
-        /// Local secondary indexes of the table.
-        /// </summary>
+        /// <inheritdoc/>
         public Dictionary<string, LocalSecondaryIndexDescription> LocalSecondaryIndexes { get; private set; }
 
-        /// <summary>
-        /// Names of the local secondary indexes of the table.
-        /// </summary>
+        /// <inheritdoc/>
         public List<string> LocalSecondaryIndexNames { get; private set; }
 
-        /// <summary>
-        /// Names of the global secondary indexes of the table.
-        /// </summary>
+        /// <inheritdoc/>
         public List<string> GlobalSecondaryIndexNames { get; private set; }
 
-        /// <summary>
-        /// List of keys on the table marked HASH
-        /// </summary>
+        /// <inheritdoc/>
         public List<string> HashKeys { get; private set; }
 
-        /// <summary>
-        /// List of keys on the table marked RANGE
-        /// </summary>
+        /// <inheritdoc/>
         public List<string> RangeKeys { get; private set; }
 
-        /// <summary>
-        /// List of key attributes on the table.
-        /// </summary>
+        /// <inheritdoc/>
         public List<AttributeDefinition> Attributes { get; set; }
 
         #endregion
@@ -444,7 +641,7 @@ public static void ClearTableCache()
         /// <param name="config">Configuration to use for the table.</param>
         /// <returns>Table object representing the specified table.</returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static Table LoadTable(IAmazonDynamoDB ddbClient, TableConfig config)
+        public static ITable LoadTable(IAmazonDynamoDB ddbClient, TableConfig config)
         {
             Table table = new Table(ddbClient, config);
             var tableDescriptionCache = table.GetTableDescriptionCache();
@@ -650,7 +847,7 @@ internal static Table CreateTableFromItemStorageConfig(IAmazonDynamoDB client, T
         /// <param name="tableName">Name of the table.</param>
         /// <returns>Table object representing the specified table.</returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName)
+        public static ITable LoadTable(IAmazonDynamoDB ddbClient, string tableName)
         {
             return LoadTable(ddbClient, tableName, DynamoDBEntryConversion.CurrentConversion, false);
         }
@@ -666,7 +863,7 @@ public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName)
         /// <param name="conversion">Conversion to use for converting .NET values to DynamoDB values.</param>
         /// <returns>Table object representing the specified table.</returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion)
+        public static ITable LoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion)
         {
             return LoadTable(ddbClient, tableName, conversion, false);
         }
@@ -682,7 +879,7 @@ public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName, Dynam
         /// <param name="isEmptyStringValueEnabled">If the property is false, empty string values will be interpreted as null values.</param>
         /// <returns>Table object representing the specified table.</returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName, bool isEmptyStringValueEnabled)
+        public static ITable LoadTable(IAmazonDynamoDB ddbClient, string tableName, bool isEmptyStringValueEnabled)
         {
             return LoadTable(ddbClient, tableName, DynamoDBEntryConversion.CurrentConversion, isEmptyStringValueEnabled);
         }
@@ -699,7 +896,7 @@ public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName, bool
         /// <param name="isEmptyStringValueEnabled">If the property is false, empty string values will be interpreted as null values.</param>
         /// <returns>Table object representing the specified table.</returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion, bool isEmptyStringValueEnabled)
+        public static ITable LoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion, bool isEmptyStringValueEnabled)
         {
             var config = new TableConfig(tableName, conversion, DynamoDBConsumer.DocumentModel, storeAsEpoch: null, isEmptyStringValueEnabled: isEmptyStringValueEnabled, metadataCachingMode: MetadataCachingMode.Default);
 
@@ -721,7 +918,7 @@ public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName, Dynam
         /// IAmazonDynamoDB.DescribeTable(string) internally to populate the cache.</param>
         /// <returns>Table object representing the specified table.</returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion, bool isEmptyStringValueEnabled, MetadataCachingMode metadataCachingMode)
+        public static ITable LoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion, bool isEmptyStringValueEnabled, MetadataCachingMode metadataCachingMode)
         {
             var config = new TableConfig(tableName, conversion, DynamoDBConsumer.DocumentModel, storeAsEpoch: null, isEmptyStringValueEnabled: isEmptyStringValueEnabled, metadataCachingMode: metadataCachingMode);
 
@@ -743,7 +940,7 @@ public static Table LoadTable(IAmazonDynamoDB ddbClient, string tableName, Dynam
         /// True if table was successfully loaded; otherwise false.
         /// </returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, out Table table)
+        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, out ITable table)
         {
             return TryLoadTable(ddbClient, tableName, DynamoDBEntryConversion.CurrentConversion, false, out table);
         }
@@ -762,7 +959,7 @@ public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, out
         /// True if table was successfully loaded; otherwise false.
         /// </returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion, out Table table)
+        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion, out ITable table)
         {
             return TryLoadTable(ddbClient, tableName, conversion, false, out table);
         }
@@ -781,7 +978,7 @@ public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, Dyn
         /// True if table was successfully loaded; otherwise false.
         /// </returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, bool isEmptyStringValueEnabled, out Table table)
+        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, bool isEmptyStringValueEnabled, out ITable table)
         {
             return TryLoadTable(ddbClient, tableName, DynamoDBEntryConversion.CurrentConversion, isEmptyStringValueEnabled, out table);
         }
@@ -801,7 +998,7 @@ public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, boo
         /// True if table was successfully loaded; otherwise false.
         /// </returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion, bool isEmptyStringValueEnabled, out Table table)
+        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, string tableName, DynamoDBEntryConversion conversion, bool isEmptyStringValueEnabled, out ITable table)
         {
             return TryLoadTable(ddbClient, tableName, conversion, isEmptyStringValueEnabled, MetadataCachingMode.Default, out table);
         }
@@ -829,7 +1026,7 @@ public static bool TryLoadTable(IAmazonDynamoDB ddbClient,
                                         DynamoDBEntryConversion conversion,
                                         bool isEmptyStringValueEnabled,
                                         MetadataCachingMode? metadataCachingMode,
-                                        out Table table)
+                                        out ITable table)
         {
             var config = new TableConfig(tableName,
                                          conversion,
@@ -854,11 +1051,12 @@ public static bool TryLoadTable(IAmazonDynamoDB ddbClient,
         /// True if table was successfully loaded; otherwise false.
         /// </returns>
         [Obsolete("Use the TableBuilder to construct a Table with the recommended configuration.")]
-        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, TableConfig config, out Table table)
+        public static bool TryLoadTable(IAmazonDynamoDB ddbClient, TableConfig config, out ITable table)
         {
             if (config == null)
                 throw new ArgumentNullException("config");
 
+#pragma warning disable CA1031 // Do not catch general exception types
             try
             {
                 table = LoadTable(ddbClient, config);
@@ -869,46 +1067,31 @@ public static bool TryLoadTable(IAmazonDynamoDB ddbClient, TableConfig config, o
                 table = null;
                 return false;
             }
+#pragma warning restore CA1031 // Do not catch general exception types
         }
         #endregion
 
         #region Conversion methods
 
-        /// <summary>
-        /// Creates a Document from an attribute map.
-        /// </summary>
-        /// <param name="data">Map of attribute names to attribute values.</param>
-        /// <returns>Document representing the data.</returns>
+        /// <inheritdoc/>
         public Document FromAttributeMap(Dictionary<string, AttributeValue> data)
         {
             return Document.FromAttributeMap(data, this.StoreAsEpoch);
         }
 
-        /// <summary>
-        /// Creates a map of attribute names mapped to AttributeValue objects.
-        /// Converts .NET types using the conversion specified in this Table.
-        /// </summary>
-        /// <returns></returns>
+        /// <inheritdoc/>
         public Dictionary<string, AttributeValue> ToAttributeMap(Document doc)
         {
             return doc.ToAttributeMap(this.Conversion, this.StoreAsEpoch, this.IsEmptyStringValueEnabled);
         }
 
-        /// <summary>
-        /// Creates a map of attribute names mapped to ExpectedAttributeValue objects.
-        /// </summary>
-        /// <returns></returns>
+        /// <inheritdoc/>
         public Dictionary<string, ExpectedAttributeValue> ToExpectedAttributeMap(Document doc)
         {
             return doc.ToExpectedAttributeMap(this.Conversion, this.StoreAsEpoch, this.IsEmptyStringValueEnabled);
         }
 
-        /// <summary>
-        /// Creates a map of attribute names mapped to AttributeValueUpdate objects.
-        /// </summary>
-        /// <param name="doc"></param>
-        /// <param name="changedAttributesOnly">If true, only attributes that have been changed will be in the map.</param>
-        /// <returns></returns>
+        /// <inheritdoc/>
         public Dictionary<string, AttributeValueUpdate> ToAttributeUpdateMap(Document doc, bool changedAttributesOnly)
         {
             return doc.ToAttributeUpdateMap(this.Conversion, changedAttributesOnly, this.StoreAsEpoch, this.IsEmptyStringValueEnabled);
@@ -1397,28 +1580,14 @@ internal async Task<Document> DeleteHelperAsync(Key key, DeleteItemOperationConf
 
         #region Scan
 
-        /// <summary>
-        /// Initiates a Search object to Scan a DynamoDB table, with the
-        /// specified filter.
-        /// 
-        /// No calls are made until the Search object is used.
-        /// </summary>
-        /// <param name="filter">Filter to apply to the scan.</param>
-        /// <returns>Resultant Search container.</returns>
-        public Search Scan(ScanFilter filter)
+        /// <inheritdoc/>
+        public ISearch Scan(ScanFilter filter)
         {
             return Scan(new ScanOperationConfig { Filter = filter });
         }
 
-        /// <summary>
-        /// Initiates a Search object to Scan a DynamoDB table, with the
-        /// specified expression.
-        /// 
-        /// No calls are made until the Search object is used.
-        /// </summary>
-        /// <param name="filterExpression">Expression to apply to the scan.</param>
-        /// <returns>Resultant Search container.</returns>
-        public Search Scan(Expression filterExpression)
+        /// <inheritdoc/>
+        public ISearch Scan(Expression filterExpression)
         {
             ScanOperationConfig config = new ScanOperationConfig
             {
@@ -1429,15 +1598,8 @@ public Search Scan(Expression filterExpression)
         }
 
 
-        /// <summary>
-        /// Initiates a Search object to Scan a DynamoDB table, with the
-        /// specified config.
-        /// 
-        /// No calls are made until the Search object is used.
-        /// </summary>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>Resultant Search container.</returns>
-        public Search Scan(ScanOperationConfig config)
+        /// <inheritdoc/>
+        public ISearch Scan(ScanOperationConfig config)
         {
             var currentConfig = config ?? new ScanOperationConfig();
 
@@ -1471,16 +1633,8 @@ public Search Scan(ScanOperationConfig config)
 
         #region Query
 
-        /// <summary>
-        /// Initiates a Search object to Query a DynamoDB table, with the
-        /// specified hash primary key and filter.
-        /// 
-        /// No calls are made until the Search object is used.
-        /// </summary>
-        /// <param name="hashKey">Value of the hash key for the query operation.</param>
-        /// <param name="filter">Filter to use.</param>
-        /// <returns>Resultant Search container.</returns>
-        public Search Query(Primitive hashKey, QueryFilter filter)
+        /// <inheritdoc/>
+        public ISearch Query(Primitive hashKey, QueryFilter filter)
         {
             string hashKeyName = this.HashKeys[0];
             QueryFilter fullFilter = new QueryFilter(filter);
@@ -1490,16 +1644,8 @@ public Search Query(Primitive hashKey, QueryFilter filter)
         }
 
 
-        /// <summary>
-        /// Initiates a Search object to Query a DynamoDB table, with the
-        /// specified hash primary key and expression.
-        /// 
-        /// No calls are made until the Search object is used.
-        /// </summary>
-        /// <param name="hashKey">Value of the hash key for the query operation.</param>
-        /// <param name="filterExpression">Expression to use.</param>
-        /// <returns>Resultant Search container.</returns>
-        public Search Query(Primitive hashKey, Expression filterExpression)
+        /// <inheritdoc/>
+        public ISearch Query(Primitive hashKey, Expression filterExpression)
         {
             string hashKeyName = this.HashKeys[0];
 
@@ -1515,28 +1661,14 @@ public Search Query(Primitive hashKey, Expression filterExpression)
             return Query(config);
         }
 
-        /// <summary>
-        /// Initiates a Search object to Query a DynamoDB table, with the
-        /// specified filter.
-        /// 
-        /// No calls are made until the Search object is used.
-        /// </summary>
-        /// <param name="filter">Filter to use.</param>
-        /// <returns>Resultant Search container.</returns>
-        public Search Query(QueryFilter filter)
+        /// <inheritdoc/>
+        public ISearch Query(QueryFilter filter)
         {
             return Query(new QueryOperationConfig { Filter = filter });
         }
 
-        /// <summary>
-        /// Initiates a Search object to Query a DynamoDB table, with the
-        /// specified config.
-        /// 
-        /// No calls are made until the Search object is used.
-        /// </summary>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>Resultant Search container.</returns>
-        public Search Query(QueryOperationConfig config)
+        /// <inheritdoc/>
+        public ISearch Query(QueryOperationConfig config)
         {
             if (config == null)
                 throw new ArgumentNullException("config");
@@ -1567,12 +1699,8 @@ public Search Query(QueryOperationConfig config)
 
         #region BatchGet
 
-        /// <summary>
-        /// Creates a DocumentBatchGet object for the current table, allowing
-        /// a batch-get operation against DynamoDB.
-        /// </summary>
-        /// <returns>Empty DocumentBatchGet object.</returns>
-        public DocumentBatchGet CreateBatchGet()
+        /// <inheritdoc/>
+        public IDocumentBatchGet CreateBatchGet()
         {
             return new DocumentBatchGet(this);
         }
@@ -1582,12 +1710,8 @@ public DocumentBatchGet CreateBatchGet()
 
         #region BatchWrite
 
-        /// <summary>
-        /// Creates a DocumentBatchWrite object for the current table, allowing
-        /// a batch-put/delete operation against DynamoDB.
-        /// </summary>
-        /// <returns>Empty DocumentBatchWrite object.</returns>
-        public DocumentBatchWrite CreateBatchWrite()
+        /// <inheritdoc/>
+        public IDocumentBatchWrite CreateBatchWrite()
         {
             return new DocumentBatchWrite(this);
         }
@@ -1597,12 +1721,8 @@ public DocumentBatchWrite CreateBatchWrite()
 
         #region TransactGet
 
-        /// <summary>
-        /// Creates a DocumentTransactGet object for the current table, allowing
-        /// a transactional get operation against DynamoDB.
-        /// </summary>
-        /// <returns>Empty DocumentTransactGet object.</returns>
-        public DocumentTransactGet CreateTransactGet()
+        /// <inheritdoc/>
+        public IDocumentTransactGet CreateTransactGet()
         {
             return new DocumentTransactGet(this);
         }
@@ -1612,12 +1732,8 @@ public DocumentTransactGet CreateTransactGet()
 
         #region TransactWrite
 
-        /// <summary>
-        /// Creates a DocumentTransactWrite object for the current table, allowing
-        /// a transactional condition-check/put/update/delete operation against DynamoDB.
-        /// </summary>
-        /// <returns>Empty DocumentTransactWrite object.</returns>
-        public DocumentTransactWrite CreateTransactWrite()
+        /// <inheritdoc/>
+        public IDocumentTransactWrite CreateTransactWrite()
         {
             return new DocumentTransactWrite(this);
         }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentBatchGet.Async.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentBatchGet.Async.cs
index d3b0665a0fe2..a0ef642ab898 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentBatchGet.Async.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentBatchGet.Async.cs
@@ -14,57 +14,48 @@
  */
 #pragma warning disable 1574
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Class for retrieving a batch of Documents from a single DynamoDB table.
-    /// </summary>
-    public partial class DocumentBatchGet
+    public partial interface IDocumentBatchGet
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a server call to batch-get the documents requested.
         /// Populates Results with the retrieved items.
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+
+    public partial class DocumentBatchGet : IDocumentBatchGet
+    {
+        /// <inheritdoc/>
         public Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return ExecuteHelperAsync(cancellationToken);
         }
-
-        #endregion
     }
 
-    /// <summary>
-    /// Class for retrieving a batch of Documents from multiple DynamoDB tables.
-    /// </summary>
-    public partial class MultiTableDocumentBatchGet
+    public partial interface IMultiTableDocumentBatchGet
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a multi-table batch request against all configured batches.
         /// Results are stored in the respective DocumentBatchGet objects.
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+    
+    public partial class MultiTableDocumentBatchGet : IMultiTableDocumentBatchGet
+    {
+        /// <inheritdoc/>
         public Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return ExecuteHelperAsync(cancellationToken);
         }
-
-        #endregion
     }
-
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentBatchWrite.Async.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentBatchWrite.Async.cs
index 2a01e95897fa..aa791aceb1e8 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentBatchWrite.Async.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentBatchWrite.Async.cs
@@ -14,25 +14,13 @@
  */
 #pragma warning disable 1574
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Class for putting and/or deleting a batch of items in a single DynamoDB table.
-    /// </summary>
-    public partial class DocumentBatchWrite
+    public partial interface IDocumentBatchWrite
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a server call to batch-put/delete the item specified.
         ///
@@ -41,21 +29,20 @@ public partial class DocumentBatchWrite
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+
+    public partial class DocumentBatchWrite : IDocumentBatchWrite
+    {
+        /// <inheritdoc/>
         public Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return ExecuteHelperAsync(cancellationToken);
         }
-
-        #endregion
     }
 
-    /// <summary>
-    /// Class for putting and/or deleting a batch of items in multiple DynamoDB tables.
-    /// </summary>
-    public partial class MultiTableDocumentBatchWrite
+    public partial interface IMultiTableDocumentBatchWrite
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a multi-table batch put/delete against all configured batches.
         ///
@@ -64,11 +51,15 @@ public partial class MultiTableDocumentBatchWrite
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+
+    public partial class MultiTableDocumentBatchWrite : IMultiTableDocumentBatchWrite
+    {
+        /// <inheritdoc/>
         public Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return ExecuteHelperAsync(cancellationToken);
         }
-
-        #endregion
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentTransactGet.Async.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentTransactGet.Async.cs
index edaabedc1c5f..3a3a3239c3ca 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentTransactGet.Async.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentTransactGet.Async.cs
@@ -18,10 +18,7 @@
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Class for retrieving multiple Documents from a single DynamoDB table in a transaction.
-    /// </summary>
-    public partial class DocumentTransactGet
+    public partial interface IDocumentTransactGet
     {
         #region Public methods
 
@@ -31,32 +28,37 @@ public partial class DocumentTransactGet
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken));
+
+        #endregion
+    }
+
+    public partial class DocumentTransactGet : IDocumentTransactGet
+    {
+        /// <inheritdoc/>
         public Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return ExecuteHelperAsync(cancellationToken);
         }
-
-        #endregion
     }
 
-    /// <summary>
-    /// Class for retrieving multiple Documents from multiple DynamoDB tables in a transaction.
-    /// </summary>
-    public partial class MultiTableDocumentTransactGet
+    public partial interface IMultiTableDocumentTransactGet
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a multi-table transaction request against all configured DocumentTransactGet objects.
         /// Results are stored in the respective DocumentTransactGet objects.
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+
+    public partial class MultiTableDocumentTransactGet : IMultiTableDocumentTransactGet
+    {
+        /// <inheritdoc/>
         public Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return ExecuteHelperAsync(cancellationToken);
         }
-
-        #endregion
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentTransactWrite.Async.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentTransactWrite.Async.cs
index 064870c203c2..18b39e01c350 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentTransactWrite.Async.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/DocumentTransactWrite.Async.cs
@@ -18,45 +18,41 @@
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Class for condition checking, putting, updating and/or deleting
-    /// multiple items in a single DynamoDB table in a transaction.
-    /// </summary>
-    public partial class DocumentTransactWrite
+    public partial interface IDocumentTransactWrite
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a server call to condition-check/put/update/delete the items specified in a transaction.
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+
+    public partial class DocumentTransactWrite : IDocumentTransactWrite
+    {
+        /// <inheritdoc/>
         public Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return ExecuteHelperAsync(cancellationToken);
         }
-
-        #endregion
     }
 
-    /// <summary>
-    /// Class for condition checking, putting, updating and/or deleting
-    /// multiple items in multiple DynamoDB tables in a transaction.
-    /// </summary>
-    public partial class MultiTableDocumentTransactWrite
+    public partial interface IMultiTableDocumentTransactWrite
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a multi-table transactional condition-check/put/update/delete against all configured DocumentTransactWrite objects.
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+
+    public partial class MultiTableDocumentTransactWrite : IMultiTableDocumentTransactWrite
+    {
+        /// <inheritdoc/>
         public Task ExecuteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return ExecuteHelperAsync(cancellationToken);
         }
-
-        #endregion
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/Search.Async.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/Search.Async.cs
index 7e34958b7e8f..575fafe3b4f2 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/Search.Async.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/Search.Async.cs
@@ -14,50 +14,47 @@
  */
 #pragma warning disable 1574
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Search response object
-    /// </summary>
-    public partial class Search
+    public partial interface ISearch
     {
-
-        #region Async public 
-
         /// <summary>
         /// Initiates the asynchronous execution of the GetNextSet operation.
-        /// 
+        ///
         /// If there are more items in the Scan/Query, PaginationToken will be
         /// set and can be consumed in a new Scan/Query operation to resume
         /// retrieving items from this point.
-        /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.Search.GetNextSet"/>
+        /// <seealso cref="Search.GetNextSet"/>
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<List<Document>> GetNextSetAsync(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return GetNextSetHelperAsync(cancellationToken);
-        }
+        Task<List<Document>> GetNextSetAsync(CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the GetRemaining operation.
-        /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.Search.GetRemaining"/>
+        /// <seealso cref="Search.GetRemaining"/>
         /// </summary>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task<List<Document>> GetRemainingAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+
+    public partial class Search : ISearch
+    {
+        /// <inheritdoc/>
+        public Task<List<Document>> GetNextSetAsync(CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return GetNextSetHelperAsync(cancellationToken);
+        }
+
+        /// <inheritdoc/>
         public Task<List<Document>> GetRemainingAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return GetRemainingHelperAsync(cancellationToken);
         }
-
-        #endregion
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/Table.Async.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/Table.Async.cs
index c29cc415c372..adca09ba7bef 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/Table.Async.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_async/Table.Async.cs
@@ -28,7 +28,7 @@
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    public partial class Table
+    public partial interface ITable
     {
         #region PutItemAsync
 
@@ -39,11 +39,7 @@ public partial class Table
         /// <param name="doc">Document to save.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> PutItemAsync(Document doc, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return PutItemHelperAsync(doc, null, cancellationToken);
-        }
-
+        Task<Document> PutItemAsync(Document doc, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the PutItem operation.
@@ -53,10 +49,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> PutItemAsync(Document doc, PutItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return PutItemHelperAsync(doc, config, cancellationToken);
-        }
+        Task<Document> PutItemAsync(Document doc, PutItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         #endregion
 
@@ -68,10 +61,7 @@ public partial class Table
         /// <param name="hashKey">Hash key element of the document.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> GetItemAsync(Primitive hashKey, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return GetItemHelperAsync(MakeKey(hashKey, null), null, cancellationToken);
-        }
+        Task<Document> GetItemAsync(Primitive hashKey, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the GetItem operation.
@@ -80,11 +70,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> GetItemAsync(Primitive hashKey, GetItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return GetItemHelperAsync(MakeKey(hashKey, null), config, cancellationToken);
-        }
-
+        Task<Document> GetItemAsync(Primitive hashKey, GetItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the GetItem operation.
@@ -93,10 +79,7 @@ public partial class Table
         /// <param name="rangeKey">Range key element of the document.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> GetItemAsync(Primitive hashKey, Primitive rangeKey, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return GetItemHelperAsync(MakeKey(hashKey, rangeKey), null, cancellationToken);
-        }
+        Task<Document> GetItemAsync(Primitive hashKey, Primitive rangeKey, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the GetItem operation.
@@ -106,10 +89,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> GetItemAsync(Primitive hashKey, Primitive rangeKey, GetItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return GetItemHelperAsync(MakeKey(hashKey, rangeKey), config, cancellationToken);
-        }
+        Task<Document> GetItemAsync(Primitive hashKey, Primitive rangeKey, GetItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the GetItem operation.
@@ -117,10 +97,7 @@ public partial class Table
         /// <param name="key">Ley of the document.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> GetItemAsync(IDictionary<string, DynamoDBEntry> key, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return GetItemHelperAsync(MakeKey(key), null, cancellationToken);
-        }
+        Task<Document> GetItemAsync(IDictionary<string, DynamoDBEntry> key, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the GetItem operation.
@@ -129,10 +106,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> GetItemAsync(IDictionary<string, DynamoDBEntry> key, GetItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return GetItemHelperAsync(MakeKey(key), config, cancellationToken);
-        }
+        Task<Document> GetItemAsync(IDictionary<string, DynamoDBEntry> key, GetItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         #endregion
 
@@ -144,10 +118,7 @@ public partial class Table
         /// <param name="doc">Attributes to update.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> UpdateItemAsync(Document doc, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return UpdateHelperAsync(doc, null, null, null, cancellationToken);
-        }
+        Task<Document> UpdateItemAsync(Document doc, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the UpdateItem operation.
@@ -156,10 +127,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> UpdateItemAsync(Document doc, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return UpdateHelperAsync(doc, null, null, config, cancellationToken);
-        }
+        Task<Document> UpdateItemAsync(Document doc, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the UpdateItem operation.
@@ -168,10 +136,7 @@ public partial class Table
         /// <param name="key">Key of the document.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> UpdateItemAsync(Document doc, IDictionary<string, DynamoDBEntry> key, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return UpdateHelperAsync(doc, MakeKey(key), null, cancellationToken);
-        }
+        Task<Document> UpdateItemAsync(Document doc, IDictionary<string, DynamoDBEntry> key, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the UpdateItem operation.
@@ -181,10 +146,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> UpdateItemAsync(Document doc, IDictionary<string, DynamoDBEntry> key, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return UpdateHelperAsync(doc, MakeKey(key), config, cancellationToken);
-        }
+        Task<Document> UpdateItemAsync(Document doc, IDictionary<string, DynamoDBEntry> key, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the UpdateItem operation.
@@ -193,10 +155,7 @@ public partial class Table
         /// <param name="hashKey">Hash key element of the document.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return UpdateHelperAsync(doc, hashKey, null, null, cancellationToken);
-        }
+        Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the UpdateItem operation.
@@ -206,10 +165,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return UpdateHelperAsync(doc, hashKey, null, config, cancellationToken);
-        }
+        Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the UpdateItem operation.
@@ -219,10 +175,7 @@ public partial class Table
         /// <param name="rangeKey">Range key element of the document.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, Primitive rangeKey, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return UpdateHelperAsync(doc, hashKey, rangeKey, null, cancellationToken);
-        }
+        Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, Primitive rangeKey, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the UpdateItem operation.
@@ -233,10 +186,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, Primitive rangeKey, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return UpdateHelperAsync(doc, hashKey, rangeKey, config, cancellationToken);
-        }
+        Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, Primitive rangeKey, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
 
         #endregion
@@ -249,10 +199,7 @@ public partial class Table
         /// <param name="document">Document to delete.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> DeleteItemAsync(Document document, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return DeleteHelperAsync(MakeKey(document), null, cancellationToken);
-        }
+        Task<Document> DeleteItemAsync(Document document, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the DeleteItem operation.
@@ -261,10 +208,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> DeleteItemAsync(Document document, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return DeleteHelperAsync(MakeKey(document), config, cancellationToken);
-        }
+        Task<Document> DeleteItemAsync(Document document, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the DeleteItem operation.
@@ -272,10 +216,7 @@ public partial class Table
         /// <param name="hashKey">Hash key element of the document.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> DeleteItemAsync(Primitive hashKey, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return DeleteHelperAsync(MakeKey(hashKey, null), null, cancellationToken);
-        }
+        Task<Document> DeleteItemAsync(Primitive hashKey, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the DeleteItem operation.
@@ -284,10 +225,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> DeleteItemAsync(Primitive hashKey, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return DeleteHelperAsync(MakeKey(hashKey, null), config, cancellationToken);
-        }
+        Task<Document> DeleteItemAsync(Primitive hashKey, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the DeleteItem operation.
@@ -296,10 +234,7 @@ public partial class Table
         /// <param name="rangeKey">Range key element of the document.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> DeleteItemAsync(Primitive hashKey, Primitive rangeKey, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return DeleteHelperAsync(MakeKey(hashKey, rangeKey), null, cancellationToken);
-        }
+        Task<Document> DeleteItemAsync(Primitive hashKey, Primitive rangeKey, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the DeleteItem operation.
@@ -309,10 +244,7 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> DeleteItemAsync(Primitive hashKey, Primitive rangeKey, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return DeleteHelperAsync(MakeKey(hashKey, rangeKey), config, cancellationToken);
-        }
+        Task<Document> DeleteItemAsync(Primitive hashKey, Primitive rangeKey, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the DeleteItem operation.
@@ -320,10 +252,7 @@ public partial class Table
         /// <param name="key">Key of the document.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
-        public Task<Document> DeleteItemAsync(IDictionary<string, DynamoDBEntry> key, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return DeleteHelperAsync(MakeKey(key), null, cancellationToken);
-        }
+        Task<Document> DeleteItemAsync(IDictionary<string, DynamoDBEntry> key, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution of the DeleteItem operation.
@@ -332,6 +261,169 @@ public partial class Table
         /// <param name="config">Configuration to use.</param>
         /// <param name="cancellationToken">Token which can be used to cancel the task.</param>
         /// <returns>A Task that can be used to poll or wait for results, or both.</returns>
+        Task<Document> DeleteItemAsync(IDictionary<string, DynamoDBEntry> key, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken));
+
+        #endregion
+    }
+
+    public partial class Table : ITable
+    {
+        #region PutItemAsync
+
+        /// <inheritdoc/>
+        public Task<Document> PutItemAsync(Document doc, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return PutItemHelperAsync(doc, null, cancellationToken);
+        }
+
+
+        /// <inheritdoc/>
+        public Task<Document> PutItemAsync(Document doc, PutItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return PutItemHelperAsync(doc, config, cancellationToken);
+        }
+
+        #endregion
+
+        #region GetItemAsync
+
+        /// <inheritdoc/>
+        public Task<Document> GetItemAsync(Primitive hashKey, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return GetItemHelperAsync(MakeKey(hashKey, null), null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> GetItemAsync(Primitive hashKey, GetItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return GetItemHelperAsync(MakeKey(hashKey, null), config, cancellationToken);
+        }
+
+
+        /// <inheritdoc/>
+        public Task<Document> GetItemAsync(Primitive hashKey, Primitive rangeKey, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return GetItemHelperAsync(MakeKey(hashKey, rangeKey), null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> GetItemAsync(Primitive hashKey, Primitive rangeKey, GetItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return GetItemHelperAsync(MakeKey(hashKey, rangeKey), config, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> GetItemAsync(IDictionary<string, DynamoDBEntry> key, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return GetItemHelperAsync(MakeKey(key), null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> GetItemAsync(IDictionary<string, DynamoDBEntry> key, GetItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return GetItemHelperAsync(MakeKey(key), config, cancellationToken);
+        }
+
+        #endregion
+
+        #region UpdateItemAsync
+
+        /// <inheritdoc/>
+        public Task<Document> UpdateItemAsync(Document doc, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return UpdateHelperAsync(doc, null, null, null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> UpdateItemAsync(Document doc, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return UpdateHelperAsync(doc, null, null, config, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> UpdateItemAsync(Document doc, IDictionary<string, DynamoDBEntry> key, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return UpdateHelperAsync(doc, MakeKey(key), null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> UpdateItemAsync(Document doc, IDictionary<string, DynamoDBEntry> key, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return UpdateHelperAsync(doc, MakeKey(key), config, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return UpdateHelperAsync(doc, hashKey, null, null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return UpdateHelperAsync(doc, hashKey, null, config, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, Primitive rangeKey, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return UpdateHelperAsync(doc, hashKey, rangeKey, null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> UpdateItemAsync(Document doc, Primitive hashKey, Primitive rangeKey, UpdateItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return UpdateHelperAsync(doc, hashKey, rangeKey, config, cancellationToken);
+        }
+
+
+        #endregion
+
+        #region DeleteItemAsync
+
+        /// <inheritdoc/>
+        public Task<Document> DeleteItemAsync(Document document, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return DeleteHelperAsync(MakeKey(document), null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> DeleteItemAsync(Document document, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return DeleteHelperAsync(MakeKey(document), config, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> DeleteItemAsync(Primitive hashKey, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return DeleteHelperAsync(MakeKey(hashKey, null), null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> DeleteItemAsync(Primitive hashKey, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return DeleteHelperAsync(MakeKey(hashKey, null), config, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> DeleteItemAsync(Primitive hashKey, Primitive rangeKey, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return DeleteHelperAsync(MakeKey(hashKey, rangeKey), null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> DeleteItemAsync(Primitive hashKey, Primitive rangeKey, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return DeleteHelperAsync(MakeKey(hashKey, rangeKey), config, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<Document> DeleteItemAsync(IDictionary<string, DynamoDBEntry> key, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return DeleteHelperAsync(MakeKey(key), null, cancellationToken);
+        }
+
+        /// <inheritdoc/>
         public Task<Document> DeleteItemAsync(IDictionary<string, DynamoDBEntry> key, DeleteItemOperationConfig config, CancellationToken cancellationToken = default(CancellationToken))
         {
             return DeleteHelperAsync(MakeKey(key), config, cancellationToken);
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentBatchGet.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentBatchGet.Sync.cs
index 8059a3861fa1..f43592e50f76 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentBatchGet.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentBatchGet.Sync.cs
@@ -13,52 +13,41 @@
  * permissions and limitations under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
-
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Class for retrieving a batch of Documents from a single DynamoDB table.
-    /// </summary>
-    public partial class DocumentBatchGet
+    public partial interface IDocumentBatchGet
     {
-
-        #region Public methods
-
         /// <summary>
         /// Executes a server call to batch-get the documents requested.
         /// Populates Results with the retrieved items.
         /// </summary>
+        void Execute();
+    }
+
+    public partial class DocumentBatchGet : IDocumentBatchGet
+    {
+        /// <inheritdoc/>
         public void Execute()
         {
             ExecuteHelper();
         }
-
-        #endregion
-
     }
 
-    /// <summary>
-    /// Class for retrieving a batch of Documents from multiple DynamoDB tables.
-    /// </summary>
-    public partial class MultiTableDocumentBatchGet
+    public partial interface IMultiTableDocumentBatchGet
     {
-        #region Public methods
-        
         /// <summary>
         /// Executes a multi-table batch request against all configured batches.
         /// Results are stored in the respective DocumentBatchGet objects.
         /// </summary>
+        void Execute();
+    }
+
+    public partial class MultiTableDocumentBatchGet : IMultiTableDocumentBatchGet
+    {
+        /// <inheritdoc/>
         public void Execute()
         {
             ExecuteHelper();
         }
-
-        #endregion
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentBatchWrite.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentBatchWrite.Sync.cs
index d079765f6870..826e73d584b4 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentBatchWrite.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentBatchWrite.Sync.cs
@@ -13,54 +13,45 @@
  * permissions and limitations under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
-
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Class for putting and/or deleting a batch of items in a single DynamoDB table.
-    /// </summary>
-    public partial class DocumentBatchWrite
+    public partial interface IDocumentBatchWrite
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a server call to batch-put/delete the item specified.
         /// 
         /// If more than 25 put/delete operations are specified, calls of up to 25
         /// put/delete items will be made until all items are processed.
         /// </summary>
+        void Execute();
+    }
+
+    public partial class DocumentBatchWrite : IDocumentBatchWrite
+    {
+        /// <inheritdoc/>
         public void Execute()
         {
             ExecuteHelper();
         }
-
-        #endregion
     }
 
-    /// <summary>
-    /// Class for putting and/or deleting a batch of items in multiple DynamoDB tables.
-    /// </summary>
-    public partial class MultiTableDocumentBatchWrite
+    public partial interface IMultiTableDocumentBatchWrite
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a multi-table batch put/delete against all configured batches.
-        /// 
+        ///
         /// If more than 25 put/delete operations are specified, calls of up to 25
         /// put/delete items will be made until all items are processed.
         /// </summary>
+        void Execute();
+    }
+
+    public partial class MultiTableDocumentBatchWrite : IMultiTableDocumentBatchWrite
+    {
+        /// <inheritdoc/>
         public void Execute()
         {
             ExecuteHelper();
         }
-
-        #endregion
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentTransactGet.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentTransactGet.Sync.cs
index ded4b339ac27..2827a4660611 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentTransactGet.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentTransactGet.Sync.cs
@@ -15,41 +15,39 @@
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Class for retrieving multiple Documents from a single DynamoDB table in a transaction.
-    /// </summary>
-    public partial class DocumentTransactGet
+    public partial interface IDocumentTransactGet
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a server call to get the documents requested in a transaction.
         /// Populates Results with the retrieved items.
         /// </summary>
+        void Execute();
+    }
+
+    public partial class DocumentTransactGet : IDocumentTransactGet
+    {
+        /// <inheritdoc/>
         public void Execute()
         {
             ExecuteHelper();
         }
-
-        #endregion
     }
 
-    /// <summary>
-    /// Class for retrieving multiple Documents from multiple DynamoDB tables in a transaction.
-    /// </summary>
-    public partial class MultiTableDocumentTransactGet
+    public partial interface IMultiTableDocumentTransactGet
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a multi-table transaction request against all configured DocumentTransactGet objects.
         /// Results are stored in the respective DocumentTransactGet objects.
         /// </summary>
+        void Execute();
+    }
+
+    public partial class MultiTableDocumentTransactGet : IMultiTableDocumentTransactGet
+    {
+        /// <inheritdoc/>
         public void Execute()
         {
             ExecuteHelper();
         }
-
-        #endregion
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentTransactWrite.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentTransactWrite.Sync.cs
index 8522a260d843..8054342804e5 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentTransactWrite.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/DocumentTransactWrite.Sync.cs
@@ -15,41 +15,41 @@
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Class for condition checking, putting, updating and/or deleting
-    /// multiple items in a single DynamoDB table in a transaction.
-    /// </summary>
-    public partial class DocumentTransactWrite
+    public partial interface IDocumentTransactWrite
     {
-        #region Public methods
-
         /// <summary>
         /// Executes a server call to condition-check/put/update/delete the items specified in a transaction.
         /// </summary>
+        void Execute();
+    }
+
+    public partial class DocumentTransactWrite : IDocumentTransactWrite
+    {
+        /// <inheritdoc/>
         public void Execute()
         {
             ExecuteHelper();
         }
+    }
 
-        #endregion
+    public partial interface IMultiTableDocumentTransactWrite
+    {
+        /// <summary>
+        /// Executes a multi-table transactional condition-check/put/update/delete against all configured DocumentTransactWrite objects.
+        /// </summary>
+        void Execute();
     }
 
     /// <summary>
     /// Class for condition checking, putting, updating and/or deleting
     /// multiple items in multiple DynamoDB tables in a transaction.
     /// </summary>
-    public partial class MultiTableDocumentTransactWrite
+    public partial class MultiTableDocumentTransactWrite : IMultiTableDocumentTransactWrite
     {
-        #region Public methods
-
-        /// <summary>
-        /// Executes a multi-table transactional condition-check/put/update/delete against all configured DocumentTransactWrite objects.
-        /// </summary>
+        /// <inheritdoc/>
         public void Execute()
         {
             ExecuteHelper();
         }
-
-        #endregion
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/Search.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/Search.Sync.cs
index 7b1816f8fc73..b2a916ccdb54 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/Search.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/Search.Sync.cs
@@ -13,44 +13,41 @@
  * permissions and limitations under the License.
  */
 
-using System;
 using System.Collections.Generic;
 
-using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
-
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    /// <summary>
-    /// Search response object
-    /// </summary>
-    public partial class Search
+    public partial interface ISearch
     {
-        #region Public methods
-
         /// <summary>
         /// Retrieves the next set (page) of results
-        /// 
+        ///
         /// If there are more items in the Scan/Query, PaginationToken will be
         /// set and can be consumed in a new Scan/Query operation to resume
         /// retrieving items from this point.
         /// </summary>
         /// <returns>Next set of Documents matching the search parameters</returns>
-        public List<Document> GetNextSet()
-        {
-            return GetNextSetHelper();
-        }
+        List<Document> GetNextSet();
 
         /// <summary>
         /// Retrieves all the remaining results
         /// </summary>
         /// <returns>List of Documents matching the search parameters</returns>
+        List<Document> GetRemaining();
+    }
+
+    public partial class Search : ISearch
+    {
+        /// <inheritdoc/>
+        public List<Document> GetNextSet()
+        {
+            return GetNextSetHelper();
+        }
+
+        /// <inheritdoc/>
         public List<Document> GetRemaining()
         {
             return GetRemainingHelper();
         }
-
-        #endregion
-
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/Table.Sync.cs b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/Table.Sync.cs
index 7c57bbd78dfe..31a26baa6bdf 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/Table.Sync.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DocumentModel/_bcl/Table.Sync.cs
@@ -13,19 +13,12 @@
  * permissions and limitations under the License.
  */
 
-using System;
-
 using Amazon.DynamoDBv2.Model;
-using Amazon.Runtime;
-using Amazon.Util;
-using System.Linq;
-using System.Threading;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 
 namespace Amazon.DynamoDBv2.DocumentModel
 {
-    public partial class Table
+    public partial interface ITable
     {
         #region PutItem
 
@@ -35,10 +28,7 @@ public partial class Table
         /// <param name="doc">Document to save.</param>
         /// <param name="config">Configuration to use.</param>
         /// <returns>Null or updated attributes, depending on config.</returns>
-        public Document PutItem(Document doc, PutItemOperationConfig config = null)
-        {
-            return PutItemHelper(doc, config);
-        }
+        Document PutItem(Document doc, PutItemOperationConfig config = null);
 
         /// <summary>
         /// Puts a document into DynamoDB, using optional configs.
@@ -46,22 +36,10 @@ public Document PutItem(Document doc, PutItemOperationConfig config = null)
         /// <param name="doc">Document to save.</param>
         /// <param name="config">Configuration to use.</param>
         /// <returns>True if put is successful or false if the condition in the config was not met.</returns>
-        public bool TryPutItem(Document doc, PutItemOperationConfig config = null)
-        {
-            try
-            {
-                PutItemHelper(doc, config);
-                return true;
-            }
-            catch (ConditionalCheckFailedException)
-            {
-                return false;
-            }
-        }
+        bool TryPutItem(Document doc, PutItemOperationConfig config = null);
 
         #endregion
 
-
         #region GetItem
 
         /// <summary>
@@ -70,10 +48,7 @@ public bool TryPutItem(Document doc, PutItemOperationConfig config = null)
         /// <param name="hashKey">Hash key element of the document.</param>
         /// <param name="config">Configuration to use.</param>
         /// <returns>Document from DynamoDB.</returns>
-        public Document GetItem(Primitive hashKey, GetItemOperationConfig config = null)
-        {
-            return GetItem(hashKey, null, config);
-        }
+        Document GetItem(Primitive hashKey, GetItemOperationConfig config = null);
 
         /// <summary>
         /// Gets a document from DynamoDB by hash-and-range primary key,
@@ -83,10 +58,7 @@ public Document GetItem(Primitive hashKey, GetItemOperationConfig config = null)
         /// <param name="rangeKey">Range key element of the document.</param>
         /// <param name="config">Configuration to use.</param>
         /// <returns>Document from DynamoDB.</returns>
-        public Document GetItem(Primitive hashKey, Primitive rangeKey, GetItemOperationConfig config = null)
-        {
-            return GetItemHelper(MakeKey(hashKey, rangeKey), config);
-        }
+        Document GetItem(Primitive hashKey, Primitive rangeKey, GetItemOperationConfig config = null);
 
         /// <summary>
         /// Gets a document from DynamoDB by key, using specified configs.
@@ -94,14 +66,10 @@ public Document GetItem(Primitive hashKey, Primitive rangeKey, GetItemOperationC
         /// <param name="key">Key of the document.</param>
         /// <param name="config">Configuration to use.</param>
         /// <returns>Document from DynamoDB.</returns>
-        public Document GetItem(IDictionary<string, DynamoDBEntry> key, GetItemOperationConfig config = null)
-        {
-            return GetItemHelper(MakeKey(key), config);
-        }
+        Document GetItem(IDictionary<string, DynamoDBEntry> key, GetItemOperationConfig config = null);
 
         #endregion
 
-
         #region UpdateItem
 
         /// <summary>
@@ -111,10 +79,7 @@ public Document GetItem(IDictionary<string, DynamoDBEntry> key, GetItemOperation
         /// <param name="config">Configuration to use.</param>
         /// <returns>Null or updated attributes, depending on config.</returns>
         /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.UpdateItemOperationConfig"/>
-        public Document UpdateItem(Document doc, UpdateItemOperationConfig config = null)
-        {
-            return UpdateHelper(doc, MakeKey(doc), config);
-        }
+        Document UpdateItem(Document doc, UpdateItemOperationConfig config = null);
 
         /// <summary>
         /// Update a document in DynamoDB, using specified config.
@@ -123,18 +88,7 @@ public Document UpdateItem(Document doc, UpdateItemOperationConfig config = null
         /// <param name="config">Configuration to use.</param>
         /// <returns>True if updated or false if the condition in the config was not met.</returns>
         /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.UpdateItemOperationConfig"/>
-        public bool TryUpdateItem(Document doc, UpdateItemOperationConfig config = null)
-        {
-            try
-            {
-                UpdateHelper(doc, MakeKey(doc), config);
-                return true;
-            }
-            catch (ConditionalCheckFailedException)
-            {
-                return false;
-            }
-        }
+        bool TryUpdateItem(Document doc, UpdateItemOperationConfig config = null);
 
         /// <summary>
         /// Update a document in DynamoDB, with a key to identify the
@@ -145,10 +99,7 @@ public bool TryUpdateItem(Document doc, UpdateItemOperationConfig config = null)
         /// <param name="config">Configuration to use.</param>
         /// <returns>Null or updated attributes, depending on config.</returns>
         /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.UpdateItemOperationConfig"/>
-        public Document UpdateItem(Document doc, IDictionary<string, DynamoDBEntry> key, UpdateItemOperationConfig config = null)
-        {
-            return UpdateHelper(doc, MakeKey(key), config);
-        }
+        Document UpdateItem(Document doc, IDictionary<string, DynamoDBEntry> key, UpdateItemOperationConfig config = null);
 
         /// <summary>
         /// Update a document in DynamoDB, with a key to identify the
@@ -159,18 +110,7 @@ public Document UpdateItem(Document doc, IDictionary<string, DynamoDBEntry> key,
         /// <param name="config">Configuration to use.</param>
         /// <returns>True if updated or false if the condition in the config was not met.</returns>
         /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.UpdateItemOperationConfig"/>
-        public bool TryUpdateItem(Document doc, IDictionary<string, DynamoDBEntry> key, UpdateItemOperationConfig config = null)
-        {
-            try
-            {
-                UpdateHelper(doc, MakeKey(key), config);
-                return true;
-            }
-            catch (ConditionalCheckFailedException)
-            {
-                return false;
-            }
-        }
+        bool TryUpdateItem(Document doc, IDictionary<string, DynamoDBEntry> key, UpdateItemOperationConfig config = null);
 
         /// <summary>
         /// Update a document in DynamoDB, with a hash primary key to identify
@@ -181,10 +121,7 @@ public bool TryUpdateItem(Document doc, IDictionary<string, DynamoDBEntry> key,
         /// <param name="config">Configuration to use.</param>
         /// <returns>Null or updated attributes, depending on config.</returns>
         /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.UpdateItemOperationConfig"/>
-        public Document UpdateItem(Document doc, Primitive hashKey, UpdateItemOperationConfig config = null)
-        {
-            return UpdateHelper(doc, MakeKey(hashKey, null), config);
-        }
+        Document UpdateItem(Document doc, Primitive hashKey, UpdateItemOperationConfig config = null);
 
         /// <summary>
         /// Update a document in DynamoDB, with a hash primary key to identify
@@ -195,18 +132,7 @@ public Document UpdateItem(Document doc, Primitive hashKey, UpdateItemOperationC
         /// <param name="config">Configuration to use.</param>
         /// <returns>True if updated or false if the condition in the config was not met.</returns>
         /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.UpdateItemOperationConfig"/>
-        public bool TryUpdateItem(Document doc, Primitive hashKey, UpdateItemOperationConfig config = null)
-        {
-            try
-            {
-                UpdateHelper(doc, MakeKey(hashKey, null), config);
-                return true;
-            }
-            catch (ConditionalCheckFailedException)
-            {
-                return false;
-            }
-        }
+        bool TryUpdateItem(Document doc, Primitive hashKey, UpdateItemOperationConfig config = null);
 
         /// <summary>
         /// Update a document in DynamoDB, with a hash-and-range primary key to identify
@@ -218,10 +144,7 @@ public bool TryUpdateItem(Document doc, Primitive hashKey, UpdateItemOperationCo
         /// <param name="config">Configuration to use.</param>
         /// <returns>Null or updated attributes, depending on config.</returns>
         /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.UpdateItemOperationConfig"/>
-        public Document UpdateItem(Document doc, Primitive hashKey, Primitive rangeKey, UpdateItemOperationConfig config = null)
-        {
-            return UpdateHelper(doc, MakeKey(hashKey, rangeKey), config);
-        }
+        Document UpdateItem(Document doc, Primitive hashKey, Primitive rangeKey, UpdateItemOperationConfig config = null);
 
         /// <summary>
         /// Update a document in DynamoDB, with a hash-and-range primary key to identify
@@ -233,6 +156,208 @@ public Document UpdateItem(Document doc, Primitive hashKey, Primitive rangeKey,
         /// <param name="config">Configuration to use.</param>
         /// <returns>True if updated or false if the condition in the config was not met.</returns>
         /// <seealso cref="Amazon.DynamoDBv2.DocumentModel.UpdateItemOperationConfig"/>
+        bool TryUpdateItem(Document doc, Primitive hashKey, Primitive rangeKey, UpdateItemOperationConfig config = null);
+
+        #endregion
+
+        #region DeleteItem
+
+        /// <summary>
+        /// Delete a document in DynamoDB, using specified configs.
+        /// </summary>
+        /// <exception cref="T:Amazon.DynamoDBv2.Model.ConditionalCheckFailedException">If the condition set on the config fails.</exception>
+        /// <param name="document">Document to delete.</param>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>Null or old attributes, depending on config.</returns>
+        Document DeleteItem(Document document, DeleteItemOperationConfig config = null);
+
+        /// <summary>
+        /// Delete a document in DynamoDB, using specified configs.
+        /// </summary>
+        /// <param name="document">Document to delete.</param>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>True if deleted or false if the condition in the config was not met.</returns>
+        bool TryDeleteItem(Document document, DeleteItemOperationConfig config = null);
+
+        /// <summary>
+        /// Delete a document in DynamoDB, identified by hash-key,
+        /// using the specified configs.
+        /// </summary>
+        /// <exception cref="T:Amazon.DynamoDBv2.Model.ConditionalCheckFailedException">If the condition set on the config fails.</exception>
+        /// <param name="hashKey">Hash key element of the document.</param>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>Null or old attributes, depending on config.</returns>
+        Document DeleteItem(Primitive hashKey, DeleteItemOperationConfig config = null);
+
+        /// <summary>
+        /// Delete a document in DynamoDB, identified by a hash primary key,
+        /// using specified configs.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the document.</param>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>True if deleted or false if the condition in the config was not met.</returns>
+        bool TryDeleteItem(Primitive hashKey, DeleteItemOperationConfig config = null);
+
+        /// <summary>
+        /// Delete a document in DynamoDB, identified by hash-and-range primary key,
+        /// using the specified configs.
+        /// </summary>
+        /// <exception cref="T:Amazon.DynamoDBv2.Model.ConditionalCheckFailedException">If the condition set on the config fails.</exception>
+        /// <param name="hashKey">Hash key element of the document.</param>
+        /// <param name="rangeKey">Range key element of the document.</param>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>Null or old attributes, depending on config.</returns>
+        Document DeleteItem(Primitive hashKey, Primitive rangeKey, DeleteItemOperationConfig config = null);
+
+        /// <summary>
+        /// Delete a document in DynamoDB, identified by hash-and-range primary key,
+        /// using the specified configs.
+        /// </summary>
+        /// <param name="hashKey">Hash key element of the document.</param>
+        /// <param name="rangeKey">Range key element of the document.</param>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>True if deleted or false if the condition in the config was not met.</returns>
+        bool TryDeleteItem(Primitive hashKey, Primitive rangeKey, DeleteItemOperationConfig config = null);
+
+        /// <summary>
+        /// Delete a document in DynamoDB, identified by a key, using specified configs.
+        /// </summary>
+        /// <exception cref="T:Amazon.DynamoDBv2.Model.ConditionalCheckFailedException">If the condition set on the config fails.</exception>
+        /// <param name="key">Key of the document.</param>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>Null or old attributes, depending on config.</returns>
+        Document DeleteItem(IDictionary<string, DynamoDBEntry> key, DeleteItemOperationConfig config = null);
+
+        /// <summary>
+        /// Delete a document in DynamoDB, identified by a key, using specified configs.
+        /// </summary>
+        /// <param name="key">Key of the document.</param>
+        /// <param name="config">Configuration to use.</param>
+        /// <returns>True if deleted or false if the condition in the config was not met.</returns>
+        bool TryDeleteItem(IDictionary<string, DynamoDBEntry> key, DeleteItemOperationConfig config = null);
+
+        #endregion
+    }
+
+    public partial class Table : ITable
+    {
+        #region PutItem
+
+        /// <inheritdoc/>
+        public Document PutItem(Document doc, PutItemOperationConfig config = null)
+        {
+            return PutItemHelper(doc, config);
+        }
+
+        /// <inheritdoc/>
+        public bool TryPutItem(Document doc, PutItemOperationConfig config = null)
+        {
+            try
+            {
+                PutItemHelper(doc, config);
+                return true;
+            }
+            catch (ConditionalCheckFailedException)
+            {
+                return false;
+            }
+        }
+
+        #endregion
+
+
+        #region GetItem
+
+        /// <inheritdoc/>
+        public Document GetItem(Primitive hashKey, GetItemOperationConfig config = null)
+        {
+            return GetItem(hashKey, null, config);
+        }
+
+        /// <inheritdoc/>
+        public Document GetItem(Primitive hashKey, Primitive rangeKey, GetItemOperationConfig config = null)
+        {
+            return GetItemHelper(MakeKey(hashKey, rangeKey), config);
+        }
+
+        /// <inheritdoc/>
+        public Document GetItem(IDictionary<string, DynamoDBEntry> key, GetItemOperationConfig config = null)
+        {
+            return GetItemHelper(MakeKey(key), config);
+        }
+
+        #endregion
+
+
+        #region UpdateItem
+
+        /// <inheritdoc/>
+        public Document UpdateItem(Document doc, UpdateItemOperationConfig config = null)
+        {
+            return UpdateHelper(doc, MakeKey(doc), config);
+        }
+
+        /// <inheritdoc/>
+        public bool TryUpdateItem(Document doc, UpdateItemOperationConfig config = null)
+        {
+            try
+            {
+                UpdateHelper(doc, MakeKey(doc), config);
+                return true;
+            }
+            catch (ConditionalCheckFailedException)
+            {
+                return false;
+            }
+        }
+
+        /// <inheritdoc/>
+        public Document UpdateItem(Document doc, IDictionary<string, DynamoDBEntry> key, UpdateItemOperationConfig config = null)
+        {
+            return UpdateHelper(doc, MakeKey(key), config);
+        }
+
+        /// <inheritdoc/>
+        public bool TryUpdateItem(Document doc, IDictionary<string, DynamoDBEntry> key, UpdateItemOperationConfig config = null)
+        {
+            try
+            {
+                UpdateHelper(doc, MakeKey(key), config);
+                return true;
+            }
+            catch (ConditionalCheckFailedException)
+            {
+                return false;
+            }
+        }
+
+        /// <inheritdoc/>
+        public Document UpdateItem(Document doc, Primitive hashKey, UpdateItemOperationConfig config = null)
+        {
+            return UpdateHelper(doc, MakeKey(hashKey, null), config);
+        }
+
+        /// <inheritdoc/>
+        public bool TryUpdateItem(Document doc, Primitive hashKey, UpdateItemOperationConfig config = null)
+        {
+            try
+            {
+                UpdateHelper(doc, MakeKey(hashKey, null), config);
+                return true;
+            }
+            catch (ConditionalCheckFailedException)
+            {
+                return false;
+            }
+        }
+
+        /// <inheritdoc/>
+        public Document UpdateItem(Document doc, Primitive hashKey, Primitive rangeKey, UpdateItemOperationConfig config = null)
+        {
+            return UpdateHelper(doc, MakeKey(hashKey, rangeKey), config);
+        }
+
+        /// <inheritdoc/>
         public bool TryUpdateItem(Document doc, Primitive hashKey, Primitive rangeKey, UpdateItemOperationConfig config = null)
         {
             try
@@ -251,24 +376,13 @@ public bool TryUpdateItem(Document doc, Primitive hashKey, Primitive rangeKey, U
 
         #region DeleteItem
 
-        /// <summary>
-        /// Delete a document in DynamoDB, using specified configs.
-        /// </summary>
-        /// <exception cref="T:Amazon.DynamoDBv2.Model.ConditionalCheckFailedException">If the condition set on the config fails.</exception>
-        /// <param name="document">Document to delete.</param>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>Null or old attributes, depending on config.</returns>
+        /// <inheritdoc/>
         public Document DeleteItem(Document document, DeleteItemOperationConfig config = null)
         {
             return DeleteHelper(MakeKey(document), config);
         }
 
-        /// <summary>
-        /// Delete a document in DynamoDB, using specified configs.
-        /// </summary>
-        /// <param name="document">Document to delete.</param>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>True if deleted or false if the condition in the config was not met.</returns>
+        /// <inheritdoc/>
         public bool TryDeleteItem(Document document, DeleteItemOperationConfig config = null)
         {
             try
@@ -282,26 +396,13 @@ public bool TryDeleteItem(Document document, DeleteItemOperationConfig config =
             }
         }
 
-        /// <summary>
-        /// Delete a document in DynamoDB, identified by hash-key,
-        /// using the specified configs.
-        /// </summary>
-        /// <exception cref="T:Amazon.DynamoDBv2.Model.ConditionalCheckFailedException">If the condition set on the config fails.</exception>
-        /// <param name="hashKey">Hash key element of the document.</param>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>Null or old attributes, depending on config.</returns>
+        /// <inheritdoc/>
         public Document DeleteItem(Primitive hashKey, DeleteItemOperationConfig config = null)
         {
             return DeleteHelper(MakeKey(hashKey, null), config);
         }
 
-        /// <summary>
-        /// Delete a document in DynamoDB, identified by a hash primary key,
-        /// using specified configs.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the document.</param>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>True if deleted or false if the condition in the config was not met.</returns>
+        /// <inheritdoc/>
         public bool TryDeleteItem(Primitive hashKey, DeleteItemOperationConfig config = null)
         {
             try
@@ -315,28 +416,13 @@ public bool TryDeleteItem(Primitive hashKey, DeleteItemOperationConfig config =
             }
         }
 
-        /// <summary>
-        /// Delete a document in DynamoDB, identified by hash-and-range primary key,
-        /// using the specified configs.
-        /// </summary>
-        /// <exception cref="T:Amazon.DynamoDBv2.Model.ConditionalCheckFailedException">If the condition set on the config fails.</exception>
-        /// <param name="hashKey">Hash key element of the document.</param>
-        /// <param name="rangeKey">Range key element of the document.</param>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>Null or old attributes, depending on config.</returns>
+        /// <inheritdoc/>
         public Document DeleteItem(Primitive hashKey, Primitive rangeKey, DeleteItemOperationConfig config = null)
         {
             return DeleteHelper(MakeKey(hashKey, rangeKey), config);
         }
 
-        /// <summary>
-        /// Delete a document in DynamoDB, identified by hash-and-range primary key,
-        /// using the specified configs.
-        /// </summary>
-        /// <param name="hashKey">Hash key element of the document.</param>
-        /// <param name="rangeKey">Range key element of the document.</param>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>True if deleted or false if the condition in the config was not met.</returns>
+        /// <inheritdoc/>
         public bool TryDeleteItem(Primitive hashKey, Primitive rangeKey, DeleteItemOperationConfig config = null)
         {
             try
@@ -350,24 +436,13 @@ public bool TryDeleteItem(Primitive hashKey, Primitive rangeKey, DeleteItemOpera
             }
         }
 
-        /// <summary>
-        /// Delete a document in DynamoDB, identified by a key, using specified configs.
-        /// </summary>
-        /// <exception cref="T:Amazon.DynamoDBv2.Model.ConditionalCheckFailedException">If the condition set on the config fails.</exception>
-        /// <param name="key">Key of the document.</param>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>Null or old attributes, depending on config.</returns>
+        /// <inheritdoc/>
         public Document DeleteItem(IDictionary<string, DynamoDBEntry> key, DeleteItemOperationConfig config = null)
         {
             return DeleteHelper(MakeKey(key), config);
         }
 
-        /// <summary>
-        /// Delete a document in DynamoDB, identified by a key, using specified configs.
-        /// </summary>
-        /// <param name="key">Key of the document.</param>
-        /// <param name="config">Configuration to use.</param>
-        /// <returns>True if deleted or false if the condition in the config was not met.</returns>
+        /// <inheritdoc/>
         public bool TryDeleteItem(IDictionary<string, DynamoDBEntry> key, DeleteItemOperationConfig config = null)
         {
             try
diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/Cache.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/Cache.cs
index 6f48710b2e86..5c4925d967b3 100644
--- a/sdk/test/Services/DynamoDBv2/IntegrationTests/Cache.cs
+++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/Cache.cs
@@ -100,7 +100,7 @@ public void MultipleClientsTest()
             Table.ClearTableCache();
             var tableName = testTableName;
 
-            Table table;
+            ITable table;
             using (var nc = new AmazonDynamoDBClient())
             {
 #pragma warning disable CS0618 // Disable the warning for the deprecated DynamoDBContext constructors
diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/DocumentTests.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/DocumentTests.cs
index 9631ff8038d4..234b5a0c97e1 100644
--- a/sdk/test/Services/DynamoDBv2/IntegrationTests/DocumentTests.cs
+++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/DocumentTests.cs
@@ -26,9 +26,9 @@ public void TestTableOperations()
                 // Clear tables
                 CleanupTables();
 
-                Table hashTable;
-                Table hashRangeTable;
-                Table numericHashRangeTable;
+                ITable hashTable;
+                ITable hashRangeTable;
+                ITable numericHashRangeTable;
 
                 // Load tables using provided conversion schema
                 LoadTables(conversion, out hashTable, out hashRangeTable, out numericHashRangeTable);
@@ -161,7 +161,7 @@ public void TestTableOperationsViaBuilder()
             }
         }
 
-        private void TestAsDateTimeUtc(Table numericHashRangeTable)
+        private void TestAsDateTimeUtc(ITable numericHashRangeTable)
         {
             var config = new TableConfig(numericHashRangeTable.TableName)
             {
@@ -191,7 +191,7 @@ private void TestAsDateTimeUtc(Table numericHashRangeTable)
             ApproximatelyEqual(currTimeUtc, storedDoc["NonEpochDate"].AsDateTimeUtc());
         }
 
-        private void TestEmptyString(Table hashTable)
+        private void TestEmptyString(ITable hashTable)
         {
             var companyInfo = new DynamoDBList();
             companyInfo.Add(string.Empty);
@@ -224,7 +224,7 @@ private void TestEmptyString(Table hashTable)
             Assert.AreEqual(string.Empty, savedProduct["Map"].AsDocument()["Position"].AsString());
         }
 
-        private void TestPagination(Table hashRangeTable)
+        private void TestPagination(ITable hashRangeTable)
         {
             var itemCount = 10;
             var batchWrite = hashRangeTable.CreateBatchWrite();
@@ -296,7 +296,7 @@ private void TestPagination(Table hashRangeTable)
             }
         }
 
-        private static int VerifyPagination(Search search, List<string> tokens)
+        private static int VerifyPagination(ISearch search, List<string> tokens)
         {
             int count = 0;
             do
@@ -316,7 +316,7 @@ private static int VerifyPagination(Search search, List<string> tokens)
             return count;
         }
 
-        private void TestEmptyCollections(Table hashTable)
+        private void TestEmptyCollections(ITable hashTable)
         {
             Document doc = new Document();
             doc["Id"] = 1;
@@ -339,7 +339,7 @@ private void TestEmptyCollections(Table hashTable)
             Assert.AreEqual(0, listEntry.AsDynamoDBList().Entries.Count);
         }
 
-        private void TestHashTable(Table hashTable, DynamoDBEntryConversion conversion)
+        private void TestHashTable(ITable hashTable, DynamoDBEntryConversion conversion)
         {
             // Put an item
             Document doc = new Document();
@@ -564,7 +564,7 @@ private void TestHashTable(Table hashTable, DynamoDBEntryConversion conversion)
             items = hashTable.Scan(new ScanFilter()).GetRemaining();
             Assert.AreEqual(0, items.Count);
         }
-        private void TestHashRangeTable(Table hashRangeTable, DynamoDBEntryConversion conversion)
+        private void TestHashRangeTable(ITable hashRangeTable, DynamoDBEntryConversion conversion)
         {
             // Put an item
             Document doc1 = new Document();
@@ -777,7 +777,7 @@ private void TestHashRangeTable(Table hashRangeTable, DynamoDBEntryConversion co
             }).GetRemaining();
             Assert.AreEqual(1, items.Count);
         }
-        private void TestLargeBatchOperations(Table hashTable)
+        private void TestLargeBatchOperations(ITable hashTable)
         {
             int itemCount = 30;
             int itemSize = 40 * 1024;
@@ -825,7 +825,7 @@ private void TestLargeBatchOperations(Table hashTable)
             Assert.AreEqual(0, items.Count);
         }
 
-        private void TestMultiTableDocumentBatchWrite(Table hashTable, Table hashRangeTable)
+        private void TestMultiTableDocumentBatchWrite(ITable hashTable, ITable hashRangeTable)
         {
             var multiTableDocumentBatchWrite = new MultiTableDocumentBatchWrite();
 
@@ -836,7 +836,7 @@ private void TestMultiTableDocumentBatchWrite(Table hashTable, Table hashRangeTa
             doc1b["Id"] = 5102;
             doc1b["Data"] = Guid.NewGuid().ToString();
             {
-                var writer = new DocumentBatchWrite(hashTable);
+                var writer = hashTable.CreateBatchWrite();
                 writer.AddDocumentToPut(doc1a);
                 writer.AddDocumentToPut(doc1b);
                 multiTableDocumentBatchWrite.AddBatch(writer);
@@ -849,7 +849,7 @@ private void TestMultiTableDocumentBatchWrite(Table hashTable, Table hashRangeTa
             doc2b["Id"] = 5202;
             doc2b["Data"] = Guid.NewGuid().ToString();
             {
-                var writer = new DocumentBatchWrite(hashTable);
+                var writer = hashTable.CreateBatchWrite();
                 writer.AddDocumentToPut(doc2a);
                 writer.AddDocumentToPut(doc2b);
                 multiTableDocumentBatchWrite.AddBatch(writer);
@@ -861,7 +861,7 @@ private void TestMultiTableDocumentBatchWrite(Table hashTable, Table hashRangeTa
             doc3a["Job"] = "Retired";
             doc3a["Data"] = Guid.NewGuid().ToString();
             {
-                var writer = new DocumentBatchWrite(hashRangeTable);
+                var writer = hashRangeTable.CreateBatchWrite();
                 writer.AddDocumentToPut(doc3a);
                 multiTableDocumentBatchWrite.AddBatch(writer);
             }
@@ -888,7 +888,7 @@ private void TestMultiTableDocumentBatchWrite(Table hashTable, Table hashRangeTa
 
             multiTableDocumentBatchWrite = new MultiTableDocumentBatchWrite();
             {
-                var deleteWriter = new DocumentBatchWrite(hashTable);
+                var deleteWriter = hashTable.CreateBatchWrite();
                 deleteWriter.AddItemToDelete(doc1a);
                 deleteWriter.AddItemToDelete(doc1b);
                 deleteWriter.AddItemToDelete(doc2a);
@@ -896,14 +896,14 @@ private void TestMultiTableDocumentBatchWrite(Table hashTable, Table hashRangeTa
                 multiTableDocumentBatchWrite.AddBatch(deleteWriter);
             }
             {
-                var deleteWriter = new DocumentBatchWrite(hashRangeTable);
+                var deleteWriter = hashRangeTable.CreateBatchWrite();
                 deleteWriter.AddItemToDelete(doc3a);
                 multiTableDocumentBatchWrite.AddBatch(deleteWriter);
             }
             multiTableDocumentBatchWrite.Execute();
         }
 
-        private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRangeTable, DynamoDBEntryConversion conversion)
+        private void TestMultiTableDocumentTransactWrite(ITable hashTable, ITable hashRangeTable, DynamoDBEntryConversion conversion)
         {
             // Test multi-table transactional put
             var multiTableDocumentTransactWrite = new MultiTableDocumentTransactWrite();
@@ -925,7 +925,7 @@ private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRang
             };
 
             {
-                var transactWrite = new DocumentTransactWrite(hashTable);
+                var transactWrite = hashTable.CreateTransactWrite();
                 transactWrite.AddDocumentToPut(hDoc1);
                 transactWrite.AddDocumentToPut(hDoc2);
                 multiTableDocumentTransactWrite.AddTransactionPart(transactWrite);
@@ -950,7 +950,7 @@ private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRang
             };
 
             {
-                var transactWrite = new DocumentTransactWrite(hashRangeTable);
+                var transactWrite = hashRangeTable.CreateTransactWrite();
                 transactWrite.AddDocumentToPut(hrDoc1);
                 transactWrite.AddDocumentToPut(hrDoc2);
                 multiTableDocumentTransactWrite.AddTransactionPart(transactWrite);
@@ -961,12 +961,12 @@ private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRang
             {
                 var multiTableDocumentTransactGet = new MultiTableDocumentTransactGet();
 
-                var hTransactGet = new DocumentTransactGet(hashTable);
+                var hTransactGet = hashTable.CreateTransactGet();
                 hTransactGet.AddKey(hashKey: 6001);
                 hTransactGet.AddKey(hashKey: 6002);
                 multiTableDocumentTransactGet.AddTransactionPart(hTransactGet);
 
-                var hrTransactGet = new DocumentTransactGet(hashRangeTable);
+                var hrTransactGet = hashRangeTable.CreateTransactGet();
                 hrTransactGet.AddKey(hashKey: "Alan", rangeKey: 30);
                 hrTransactGet.AddKey(hashKey: "Diane", rangeKey: 40);
                 multiTableDocumentTransactGet.AddTransactionPart(hrTransactGet);
@@ -984,7 +984,7 @@ private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRang
             multiTableDocumentTransactWrite = new MultiTableDocumentTransactWrite();
 
             {
-                var transactWrite = new DocumentTransactWrite(hashTable);
+                var transactWrite = hashTable.CreateTransactWrite();
                 transactWrite.AddDocumentToUpdate(new Document
                 {
                     ["Price"] = 1001,
@@ -999,7 +999,7 @@ private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRang
             }
 
             {
-                var transactWrite = new DocumentTransactWrite(hashRangeTable);
+                var transactWrite = hashRangeTable.CreateTransactWrite();
                 transactWrite.AddDocumentToUpdate(new Document
                 {
                     ["Score"] = 101,
@@ -1018,12 +1018,12 @@ private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRang
             {
                 var multiTableDocumentTransactGet = new MultiTableDocumentTransactGet();
 
-                var hTransactGet = new DocumentTransactGet(hashTable);
+                var hTransactGet = hashTable.CreateTransactGet();
                 hTransactGet.AddKey(key: new Document { ["Id"] = 6001 });
                 hTransactGet.AddKey(key: new Document { ["Id"] = 6002 });
                 multiTableDocumentTransactGet.AddTransactionPart(hTransactGet);
 
-                var hrTransactGet = new DocumentTransactGet(hashRangeTable);
+                var hrTransactGet = hashRangeTable.CreateTransactGet();
                 hrTransactGet.AddKey(key: new Document { ["Name"] = "Alan", ["Age"] = 30 });
                 hrTransactGet.AddKey(key: new Document { ["Name"] = "Diane", ["Age"] = 40 });
                 multiTableDocumentTransactGet.AddTransactionPart(hrTransactGet);
@@ -1053,14 +1053,14 @@ private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRang
             multiTableDocumentTransactWrite = new MultiTableDocumentTransactWrite();
 
             {
-                var transactWrite = new DocumentTransactWrite(hashTable);
+                var transactWrite = hashTable.CreateTransactWrite();
                 transactWrite.AddKeyToDelete(hashKey: 6001);
                 transactWrite.AddKeyToDelete(key: new Document { ["Id"] = 6002 });
                 multiTableDocumentTransactWrite.AddTransactionPart(transactWrite);
             }
 
             {
-                var transactWrite = new DocumentTransactWrite(hashRangeTable);
+                var transactWrite = hashRangeTable.CreateTransactWrite();
                 transactWrite.AddKeyToDelete(hashKey: "Alan", rangeKey: 30);
                 transactWrite.AddKeyToDelete(new Document { ["Name"] = "Diane", ["Age"] = 40 });
                 multiTableDocumentTransactWrite.AddTransactionPart(transactWrite);
@@ -1071,12 +1071,12 @@ private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRang
             {
                 var multiTableDocumentTransactGet = new MultiTableDocumentTransactGet();
 
-                var hTransactGet = new DocumentTransactGet(hashTable);
+                var hTransactGet = hashTable.CreateTransactGet();
                 hTransactGet.AddKey(hashKey: 6001);
                 hTransactGet.AddKey(hashKey: 6002);
                 multiTableDocumentTransactGet.AddTransactionPart(hTransactGet);
 
-                var hrTransactGet = new DocumentTransactGet(hashRangeTable);
+                var hrTransactGet = hashRangeTable.CreateTransactGet();
                 hrTransactGet.AddKey(hashKey: "Alan", rangeKey: 30);
                 hrTransactGet.AddKey(hashKey: "Diane", rangeKey: 40);
                 multiTableDocumentTransactGet.AddTransactionPart(hrTransactGet);
@@ -1087,7 +1087,7 @@ private void TestMultiTableDocumentTransactWrite(Table hashTable, Table hashRang
             }
         }
 
-        private void TestExpressionsOnDelete(Table hashTable)
+        private void TestExpressionsOnDelete(ITable hashTable)
         {
             Document doc1 = new Document();
             doc1["Id"] = 13;
@@ -1107,7 +1107,7 @@ private void TestExpressionsOnDelete(Table hashTable)
             Assert.IsTrue(hashTable.TryDeleteItem(doc1, config));
         }
 
-        private void TestExpressionsOnTransactWrite(Table hashTable, DynamoDBEntryConversion conversion)
+        private void TestExpressionsOnTransactWrite(ITable hashTable, DynamoDBEntryConversion conversion)
         {
             var doc1 = new Document
             {
@@ -1629,7 +1629,7 @@ private void TestExpressionsOnTransactWrite(Table hashTable, DynamoDBEntryConver
             }
         }
 
-        private void TestExpressionsOnQuery(Table hashRangeTable)
+        private void TestExpressionsOnQuery(ITable hashRangeTable)
         {
             Document doc1 = new Document();
             doc1["Name"] = "Gunnar";
@@ -1668,7 +1668,7 @@ private void TestExpressionsOnQuery(Table hashRangeTable)
             hashRangeTable.DeleteItem(doc2);
         }
 
-        private void TestExpressionsOnScan(Table hashRangeTable)
+        private void TestExpressionsOnScan(ITable hashRangeTable)
         {
             ClearTable(hashRangeTableName);
 
@@ -1708,7 +1708,7 @@ private void TestExpressionsOnScan(Table hashRangeTable)
             hashRangeTable.DeleteItem(doc2);
         }
 
-        private void TestExpressionPut(Table hashTable)
+        private void TestExpressionPut(ITable hashTable)
         {
             Document doc = new Document();
 
@@ -1751,7 +1751,7 @@ private void TestExpressionPut(Table hashTable)
             hashTable.DeleteItem(doc);
         }
 
-        private void TestExpressionUpdate(Table hashTable)
+        private void TestExpressionUpdate(ITable hashTable)
         {
             Document doc = new Document();
 
@@ -1810,7 +1810,7 @@ private bool AreValuesEqual(Document docA, Document docB, DynamoDBEntryConversio
                 return true;
             return docA.Equals(docB);
         }
-        private void LoadTables(DynamoDBEntryConversion conversion, out Table hashTable, out Table hashRangeTable, out Table numericHashRangeTable)
+        private void LoadTables(DynamoDBEntryConversion conversion, out ITable hashTable, out ITable hashRangeTable, out ITable numericHashRangeTable)
         {
             TableCache.Clear();
 
diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/Extensions.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/Extensions.cs
index adc14527f9af..b40a8b6b1492 100644
--- a/sdk/test/Services/DynamoDBv2/IntegrationTests/Extensions.cs
+++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/Extensions.cs
@@ -28,7 +28,7 @@ public static Dictionary<string, AttributeValue> MakeKey(this Table table, Docum
         public static Dictionary<string, AttributeValue> MakeKey<T>(this DynamoDBContext context, T item)
         {
             var doc = context.ToDocument(item);
-            var table = context.GetTargetTable<T>();
+            var table = context.GetTargetTable<T>() as Table;
             var key = table.MakeKey(doc);
             return key;
         }
diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/JSONTests.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/JSONTests.cs
index a4d4b23dec6a..f76b987ec576 100644
--- a/sdk/test/Services/DynamoDBv2/IntegrationTests/JSONTests.cs
+++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/JSONTests.cs
@@ -86,9 +86,9 @@ private void TestPutGet()
             // Clear tables
             CleanupTables();
 
-            Table hashTable;
-            Table hashRangeTable;
-            Table numericHashRangeTable;
+            ITable hashTable;
+            ITable hashRangeTable;
+            ITable numericHashRangeTable;
 
             // Load tables using provided conversion schema
             LoadTables(DynamoDBEntryConversion.V2, out hashTable, out hashRangeTable, out numericHashRangeTable);
diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/TTLTests.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/TTLTests.cs
index f92b023140a2..f62d71de4264 100644
--- a/sdk/test/Services/DynamoDBv2/IntegrationTests/TTLTests.cs
+++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/TTLTests.cs
@@ -77,7 +77,7 @@ public void TestStoreAsEpoch()
             ApproximatelyEqual(EpochDate, docV2["NonEpochDate1"].AsDateTime());
             ApproximatelyEqual(EpochDate, docV2["NonEpochDate1"].AsDateTime());
 
-            var epochTable = Context.GetTargetTable<EpochEmployee>();
+            var epochTable = Context.GetTargetTable<EpochEmployee>() as Table; // Do an explicit cast since we want to access internal methods.
             var epochAttributes = epochTable.GetStoreAsEpoch().ToList();
             Assert.AreNotEqual(0, epochAttributes.Count);
 
@@ -137,7 +137,7 @@ public void TestStoreAsAnnotatedEpoch()
             ApproximatelyEqual(EpochDate, docV2["NonEpochDate1"].AsDateTime());
             ApproximatelyEqual(EpochDate, docV2["NonEpochDate1"].AsDateTime());
 
-            var epochTable = Context.GetTargetTable<AnnotatedEpochEmployee>();
+            var epochTable = Context.GetTargetTable<AnnotatedEpochEmployee>() as Table;
             var epochAttributes = epochTable.GetStoreAsEpoch().ToList();
             Assert.AreNotEqual(0, epochAttributes.Count);
 
@@ -148,7 +148,7 @@ public void TestStoreAsAnnotatedEpoch()
             Assert.IsNotNull(epochMap["NonEpochDate2"].S);
         }
 
-        public void TestStoreAsEpoch(Table hashRangeTable, Table numericHashRangeTable)
+        public void TestStoreAsEpoch(ITable hashRangeTable, ITable numericHashRangeTable)
         {
             // verify conversions
             var e1 = DateTimeToEpochSeconds((Primitive) EpochDate, "test") as Primitive;
@@ -167,7 +167,7 @@ public void TestStoreAsEpoch(Table hashRangeTable, Table numericHashRangeTable)
                 AttributesToStoreAsEpoch = new List<string> { "CreationTime", "EpochDate2" }
             };
 #pragma warning disable CS0618 // Disable the warning for the deprecated DynamoDBContext constructors
-            var epochTable = Table.LoadTable(Client, config);
+            var epochTable = Table.LoadTable(Client, config) as Table; // Do an explicit cast since we want to access internal methods.
 #pragma warning restore CS0618 // Re-enable the warning
             CollectionAssert.AreEqual(config.AttributesToStoreAsEpoch, epochTable.GetStoreAsEpoch().ToList());
 
@@ -322,7 +322,7 @@ private static Document CreateTestDocument()
             doc["NonEpochDate"] = EpochDate;
             return doc;
         }
-        private static void TestWrittenData(Primitive hash, Primitive range, Table hashRangeTable, Table epochTable, bool checkForConditionalUpdate = false)
+        private static void TestWrittenData(Primitive hash, Primitive range, ITable hashRangeTable, ITable epochTable, bool checkForConditionalUpdate = false)
         {
             if (hashRangeTable != null)
             {
diff --git a/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentBatchGetTests.cs b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentBatchGetTests.cs
new file mode 100644
index 000000000000..879324931498
--- /dev/null
+++ b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentBatchGetTests.cs
@@ -0,0 +1,155 @@
+using Amazon.DynamoDBv2.DocumentModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System.Collections.Generic;
+
+namespace AWSSDK.UnitTests.DynamoDBv2.NetFramework.Custom.MockabilityTests
+{
+    [TestClass]
+    public class DocumentBatchGetTests
+    {
+        [TestMethod]
+        public void TestMockability_DocumentBatchGet()
+        {
+            var dummyResults = new List<Document>()
+            {
+                new Document()
+                {
+                    {"State", "CA"},
+                    {"Zip", "12345"}
+                }
+            };
+
+            var mockTable = new Mock<ITable>();
+            mockTable.Setup(x => x.CreateBatchGet()).Returns(CreateDocumentBatchGetMock(dummyResults));
+            var table = mockTable.Object;
+
+            var docBatchGet = table.CreateBatchGet();
+
+            Assert.AreEqual(0, docBatchGet.TotalKeys);
+            Assert.AreEqual(0, docBatchGet.Results.Count);
+
+            docBatchGet.AddKey("State");
+            Assert.AreEqual(1, docBatchGet.TotalKeys);
+
+            docBatchGet.Execute();
+            Assert.AreEqual(1, docBatchGet.Results.Count);
+            Assert.AreEqual("CA", docBatchGet.Results[0]["State"].AsString());
+            Assert.AreEqual("12345", docBatchGet.Results[0]["Zip"].AsString());
+        }
+
+        [TestMethod]
+        public void TestMockability_MultiTableDocumentBatchGet()
+        {
+            var addressBatchGet = CreateDocumentBatchGetMock(new List<Document>
+            { 
+                new Document()
+                {
+                    {"State", "CA"},
+                    {"Zip", "12345"}
+                }
+            });
+
+            var personBatchGet = CreateDocumentBatchGetMock(new List<Document>
+            {
+                new Document()
+                {
+                    {"FirstName", "John"},
+                    {"LastName", "Doe"}
+                }
+            });
+
+            var multiBatchGet = CreateMultiTableDocumentBatchGetMock();
+            multiBatchGet.AddBatch(addressBatchGet);
+            multiBatchGet.AddBatch(personBatchGet);
+
+            Assert.AreEqual(0, multiBatchGet.TotalKeys);
+            Assert.AreEqual(0, addressBatchGet.Results.Count);
+            Assert.AreEqual(0, personBatchGet.Results.Count);
+
+            addressBatchGet.AddKey("CA");
+            personBatchGet.AddKey("John");
+            Assert.AreEqual(2, multiBatchGet.TotalKeys);
+
+            multiBatchGet.Execute();
+
+            Assert.AreEqual(1, addressBatchGet.Results.Count);
+            Assert.AreEqual("CA", addressBatchGet.Results[0]["State"].AsString());
+            Assert.AreEqual("12345", addressBatchGet.Results[0]["Zip"].AsString());
+
+            Assert.AreEqual(1, personBatchGet.Results.Count);
+            Assert.AreEqual("John", personBatchGet.Results[0]["FirstName"].AsString());
+            Assert.AreEqual("Doe", personBatchGet.Results[0]["LastName"].AsString());
+        }
+
+        public IDocumentBatchGet CreateDocumentBatchGetMock(List<Document> results)
+        {
+            var documentBatchGet = new Mock<IDocumentBatchGet>();
+            var dummyResults = new List<Document>();
+            var keys = new List<string>();
+
+            documentBatchGet
+                .Setup(x => x.Execute())
+                .Callback(() =>
+                {
+                    dummyResults.Clear();
+                    dummyResults.AddRange(results);
+                });
+
+            documentBatchGet
+                .Setup(x => x.Results)
+                .Returns(dummyResults);
+
+            documentBatchGet
+                .Setup(x => x.AddKey(It.IsAny<Primitive>()))
+                .Callback((Primitive hashKey) =>
+                {
+                    keys.Add(hashKey.AsString());
+                });
+
+            documentBatchGet
+               .SetupGet(x => x.TotalKeys)
+               .Returns(() => keys.Count);
+
+            return documentBatchGet.Object;
+        }
+
+        public IMultiTableDocumentBatchGet CreateMultiTableDocumentBatchGetMock()
+        {
+            var multiBatchGet = new Mock<IMultiTableDocumentBatchGet>();
+            var batches = new List<IDocumentBatchGet>();
+
+            multiBatchGet
+                .Setup(x => x.Execute())
+                .Callback(() =>
+                {
+                    foreach (var batch in batches)
+                    {
+                        batch.Execute();
+                    }
+                });
+
+            multiBatchGet
+                .Setup(x => x.AddBatch(It.IsAny<IDocumentBatchGet>()))
+                .Callback((IDocumentBatchGet batch) =>
+                {
+                    batches.Add(batch);
+                });
+
+            multiBatchGet.
+                SetupGet(x => x.TotalKeys)
+                .Returns(() =>
+                {
+                    var totalKeys = 0;
+                    foreach (var batch in batches)
+                    {
+                        totalKeys += batch.TotalKeys;
+                    }
+                    return totalKeys;
+                });
+
+
+            return multiBatchGet.Object;
+        }
+    }
+}
diff --git a/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentBatchWriteTests.cs b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentBatchWriteTests.cs
new file mode 100644
index 000000000000..5f1945d47d99
--- /dev/null
+++ b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentBatchWriteTests.cs
@@ -0,0 +1,118 @@
+using Amazon.DynamoDBv2.DocumentModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AWSSDK.UnitTests.DynamoDBv2.NetFramework.Custom.MockabilityTests
+{
+    [TestClass]
+    public class DocumentBatchWriteTests
+    {
+        [TestMethod]
+        public void TestMockability_DocumentBatchWrite()
+        {
+            var itemsToPut = new List<Document>();
+            var inMemoryTable = new List<Document>();
+
+            var mockTable = new Mock<ITable>();
+            mockTable.Setup(x => x.CreateBatchWrite()).Returns(CreateDocumentBatchWriteMock(itemsToPut, inMemoryTable));
+            var table = mockTable.Object;
+
+            var batchWrite = table.CreateBatchWrite();
+
+            Assert.AreEqual(0, inMemoryTable.Count);
+            Assert.AreEqual(0, itemsToPut.Count);
+
+            batchWrite.AddDocumentToPut(new Document { { "key1", "value1" } });
+            batchWrite.AddDocumentToPut(new Document { { "key2", "value2" } });
+            Assert.AreEqual(2, itemsToPut.Count);
+            Assert.AreEqual(0, inMemoryTable.Count);
+
+            batchWrite.Execute();
+            Assert.AreEqual(0, itemsToPut.Count);
+            Assert.AreEqual(2, inMemoryTable.Count);
+
+            var firstDoc = inMemoryTable.First();
+            Assert.AreEqual("value1", firstDoc["key1"].AsString());
+            
+            var secondDoc = inMemoryTable.Skip(1).First();
+            Assert.AreEqual("value2", secondDoc["key2"].AsString());
+        }
+
+        [TestMethod]
+        public void TestMockability_MultiTableDocumentBatchWrite()
+        {
+            var itemsToPut_table1 = new List<Document>();
+            var inMemory_table1 = new List<Document>();
+            var batchWrite_table1 = CreateDocumentBatchWriteMock(itemsToPut_table1, inMemory_table1);
+            batchWrite_table1.AddDocumentToPut(new Document { { "key1", "value1" } });
+
+            var itemsToPut_table2 = new List<Document>();
+            var inMemory_table2 = new List<Document>();
+            var batchWrite_table2 = CreateDocumentBatchWriteMock(itemsToPut_table2, inMemory_table2);
+            batchWrite_table2.AddDocumentToPut(new Document { { "key2", "value2" } });
+
+            var multiBatchWrite = CreateMultiTableDocumentBatchWriteMock();
+            multiBatchWrite.AddBatch(batchWrite_table1);
+            multiBatchWrite.AddBatch(batchWrite_table2);
+
+            Assert.AreEqual(0, inMemory_table1.Count);
+            Assert.AreEqual(0, inMemory_table2.Count);
+
+            multiBatchWrite.Execute();
+            Assert.AreEqual(1, inMemory_table1.Count);
+            Assert.AreEqual(1, inMemory_table2.Count);
+            Assert.AreEqual("value1", inMemory_table1.First()["key1"].AsString());
+            Assert.AreEqual("value2", inMemory_table2.First()["key2"].AsString());
+        }
+
+        public IDocumentBatchWrite CreateDocumentBatchWriteMock(List<Document> itemsToPut, List<Document> inMemoryTable)
+        {
+            var batchWrite = new Mock<IDocumentBatchWrite>();
+
+            batchWrite
+                .Setup(x => x.AddDocumentToPut(It.IsAny<Document>()))
+                .Callback((Document item) => itemsToPut.Add(item));
+
+            batchWrite.
+                Setup(x => x.Execute())
+                .Callback(() =>
+                {
+                    foreach (var item in itemsToPut)
+                    {
+                        inMemoryTable.Add(item);
+                    }
+
+                    itemsToPut.Clear();
+                });
+
+            return batchWrite.Object;
+        }
+
+        public IMultiTableDocumentBatchWrite CreateMultiTableDocumentBatchWriteMock()
+        {
+            var multiBatchWrite = new Mock<IMultiTableDocumentBatchWrite>();
+            var batches = new List<IDocumentBatchWrite>();
+
+            multiBatchWrite
+                .Setup(x => x.AddBatch(It.IsAny<IDocumentBatchWrite>()))
+                .Callback((IDocumentBatchWrite batch) =>
+                {
+                    batches.Add(batch);
+                });
+
+            multiBatchWrite
+                .Setup(x => x.Execute())
+                .Callback(() =>
+                {
+                    foreach (var batch in batches)
+                    {
+                        batch.Execute();
+                    }
+                });
+
+            return multiBatchWrite.Object;
+        }
+    }
+}
diff --git a/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentSearchTests.cs b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentSearchTests.cs
new file mode 100644
index 000000000000..e5c5ab044ad6
--- /dev/null
+++ b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentSearchTests.cs
@@ -0,0 +1,72 @@
+using Amazon.DynamoDBv2.DocumentModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System.Collections.Generic;
+
+namespace AWSSDK.UnitTests.DynamoDBv2.NetFramework.Custom.MockabilityTests
+{
+    [TestClass]
+    public class DocumentSearchTests
+    {
+        [TestMethod]
+        public void TestMockability_DocumentScan()
+        {
+            var mockTable = new Mock<ITable>();
+            mockTable
+                .Setup(x => x.Scan(It.IsAny<ScanOperationConfig>()))
+                .Returns(CreateSearchMock(new List<Document>()
+                {
+                    new Document(){ {"id", 1}, {"name", "Bob"} },
+                    new Document(){ {"id", 2}, {"name", "Tom"} }
+                }));
+            var table = mockTable.Object;
+
+            var search = table.Scan((ScanOperationConfig)null);
+
+            var results = search.GetNextSet();
+            Assert.AreEqual(2, results.Count);
+
+            Assert.AreEqual(1, results[0]["id"].AsInt());
+            Assert.AreEqual("Bob", results[0]["name"].AsString());
+
+            Assert.AreEqual(2, results[1]["id"].AsInt());
+            Assert.AreEqual("Tom", results[1]["name"].AsString());
+        }
+
+        [TestMethod]
+        public void TestMockability_DocumentQuery()
+        {
+            var mockTable = new Mock<ITable>();
+            mockTable
+                .Setup(x => x.Query(It.IsAny<QueryOperationConfig>()))
+                .Returns(CreateSearchMock(new List<Document>()
+                {
+                    new Document(){ {"id", 1}, {"name", "Bob"} },
+                    new Document(){ {"id", 2}, {"name", "Tom"} }
+                }));
+            var table = mockTable.Object;
+
+            var search = table.Query((QueryOperationConfig)null);
+
+            var results = search.GetNextSet();
+            Assert.AreEqual(2, results.Count);
+
+            Assert.AreEqual(1, results[0]["id"].AsInt());
+            Assert.AreEqual("Bob", results[0]["name"].AsString());
+
+            Assert.AreEqual(2, results[1]["id"].AsInt());
+            Assert.AreEqual("Tom", results[1]["name"].AsString());
+        }
+
+        public ISearch CreateSearchMock(List<Document> dummyResults)
+        {
+            var search = new Mock<ISearch>();
+
+            search
+                .Setup(x => x.GetNextSet())
+                .Returns(dummyResults);
+
+            return search.Object;
+         }
+    }
+}
diff --git a/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentTransactGetTests.cs b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentTransactGetTests.cs
new file mode 100644
index 000000000000..1612a4e32d67
--- /dev/null
+++ b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentTransactGetTests.cs
@@ -0,0 +1,122 @@
+using Amazon.DynamoDBv2.DocumentModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System.Collections.Generic;
+
+namespace AWSSDK.UnitTests.DynamoDBv2.NetFramework.Custom.MockabilityTests
+{
+    [TestClass]
+    public class DocumentTransactGetTests
+    {
+        [TestMethod]
+        public void TestMockability_DocumentTransactGet()
+        {
+            var dummyResults = new List<Document>()
+            {
+                new Document()
+                {
+                    {"State", "CA"},
+                    {"Zip", "12345"}
+                }
+            };
+
+            var mockTable = new Mock<ITable>();
+            mockTable.Setup(x => x.CreateTransactGet()).Returns(CreateDocumentTransactGetMock(dummyResults));
+            var table = mockTable.Object;
+
+            var addressTransactGet = table.CreateTransactGet();
+
+            Assert.AreEqual(0, addressTransactGet.Results.Count);
+
+            addressTransactGet.Execute();
+            Assert.AreEqual(1, addressTransactGet.Results.Count);
+            Assert.AreEqual("CA", addressTransactGet.Results[0]["State"].AsString());
+            Assert.AreEqual("12345", addressTransactGet.Results[0]["Zip"].AsString());
+        }
+
+        [TestMethod]
+        public void TestMockability_MultiTableDocumentTransactGet()
+        {
+            var addressTransactGet = CreateDocumentTransactGetMock(new List<Document>
+            {
+                new Document()
+                {
+                    {"State", "CA"},
+                    {"Zip", "12345"}
+                }
+            });
+
+            var personTransactGet = CreateDocumentTransactGetMock(new List<Document>
+            {
+                new Document()
+                {
+                    {"FirstName", "John"},
+                    {"LastName", "Doe"}
+                }
+            });
+
+            var multiTransactGet = CreateMultiTableDocumentTransactGetMock();
+            multiTransactGet.AddTransactionPart(addressTransactGet);
+            multiTransactGet.AddTransactionPart(personTransactGet);
+
+            Assert.AreEqual(0, addressTransactGet.Results.Count);
+            Assert.AreEqual(0, personTransactGet.Results.Count);
+
+            multiTransactGet.Execute();
+
+            Assert.AreEqual(1, addressTransactGet.Results.Count);
+            Assert.AreEqual("CA", addressTransactGet.Results[0]["State"].AsString());
+            Assert.AreEqual("12345", addressTransactGet.Results[0]["Zip"].AsString());
+
+            Assert.AreEqual(1, personTransactGet.Results.Count);
+            Assert.AreEqual("John", personTransactGet.Results[0]["FirstName"].AsString());
+            Assert.AreEqual("Doe", personTransactGet.Results[0]["LastName"].AsString());
+        }
+
+        public IDocumentTransactGet CreateDocumentTransactGetMock(List<Document> results)
+        {
+            var transactGet = new Mock<IDocumentTransactGet>();
+            var dummyResults = new List<Document>();
+            var keys = new List<string>();
+
+            transactGet
+                .Setup(x => x.Execute())
+                .Callback(() =>
+                {
+                    dummyResults.Clear();
+                    dummyResults.AddRange(results);
+                });
+
+            transactGet
+                .Setup(x => x.Results)
+                .Returns(dummyResults);
+
+            return transactGet.Object;
+        }
+
+        public IMultiTableDocumentTransactGet CreateMultiTableDocumentTransactGetMock()
+        {
+            var multiTransactGet = new Mock<IMultiTableDocumentTransactGet>();
+            var batches = new List<IDocumentTransactGet>();
+
+            multiTransactGet
+                .Setup(x => x.Execute())
+                .Callback(() =>
+                {
+                    foreach (var batch in batches)
+                    {
+                        batch.Execute();
+                    }
+                });
+
+            multiTransactGet
+                .Setup(x => x.AddTransactionPart(It.IsAny<IDocumentTransactGet>()))
+                .Callback((IDocumentTransactGet batch) =>
+                {
+                    batches.Add(batch);
+                });
+
+            return multiTransactGet.Object;
+        }
+    }
+}
diff --git a/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentTransactWriteTests.cs b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentTransactWriteTests.cs
new file mode 100644
index 000000000000..58fd1392f1c6
--- /dev/null
+++ b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/DocumentTransactWriteTests.cs
@@ -0,0 +1,117 @@
+using Amazon.DynamoDBv2.DocumentModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AWSSDK.UnitTests.DynamoDBv2.NetFramework.Custom.MockabilityTests
+{
+    [TestClass]
+    public class DocumentTransactWriteTests
+    {
+        [TestMethod]
+        public void TestMockability_DocumentTransactWrite()
+        {
+            var itemsToPut = new List<Document>();
+            var inMemoryTable = new List<Document>();
+
+            var mockTable = new Mock<ITable>();
+            mockTable.Setup(x => x.CreateTransactWrite()).Returns(CreateDocumentTransactWriteMock(itemsToPut, inMemoryTable));
+            var table = mockTable.Object;
+
+            var docTransactWrite = table.CreateTransactWrite();
+
+            Assert.AreEqual(0, inMemoryTable.Count);
+            Assert.AreEqual(0, itemsToPut.Count);
+
+            docTransactWrite.AddDocumentToPut(new Document { { "key1", "value1" } });
+            docTransactWrite.AddDocumentToPut(new Document { { "key2", "value2" } });
+            Assert.AreEqual(2, itemsToPut.Count);
+            Assert.AreEqual(0, inMemoryTable.Count);
+
+            docTransactWrite.Execute();
+            Assert.AreEqual(0, itemsToPut.Count);
+            Assert.AreEqual(2, inMemoryTable.Count);
+
+            var firstDoc = inMemoryTable.First();
+            Assert.AreEqual("value1", firstDoc["key1"].AsString());
+
+            var secondDoc = inMemoryTable.Skip(1).First();
+            Assert.AreEqual("value2", secondDoc["key2"].AsString());
+        }
+
+        [TestMethod]
+        public void TestMockability_MultiTableDocumentTransactWrite()
+        {
+            var itemsToPut_table1 = new List<Document>();
+            var inMemory_table1 = new List<Document>();
+            var transactWrite_table1 = CreateDocumentTransactWriteMock(itemsToPut_table1, inMemory_table1);
+            transactWrite_table1.AddDocumentToPut(new Document { { "key1", "value1" } });
+
+            var itemsToPut_table2 = new List<Document>();
+            var inMemory_table2 = new List<Document>();
+            var transactWrite_table2 = CreateDocumentTransactWriteMock(itemsToPut_table2, inMemory_table2);
+            transactWrite_table2.AddDocumentToPut(new Document { { "key2", "value2" } });
+
+            var multiTransactWrite = CreateMultiTableDocumentTransactWrite();
+            multiTransactWrite.AddTransactionPart(transactWrite_table1);
+            multiTransactWrite.AddTransactionPart(transactWrite_table2);
+
+            Assert.AreEqual(0, inMemory_table1.Count);
+            Assert.AreEqual(0, inMemory_table2.Count);
+
+            multiTransactWrite.Execute();
+            Assert.AreEqual(1, inMemory_table1.Count);
+            Assert.AreEqual(1, inMemory_table2.Count);
+            Assert.AreEqual("value1", inMemory_table1.First()["key1"].AsString());
+            Assert.AreEqual("value2", inMemory_table2.First()["key2"].AsString());
+        }
+
+        public IDocumentTransactWrite CreateDocumentTransactWriteMock(List<Document> itemsToSave, List<Document> inMemoryTable)
+        {
+            var transactWrite = new Mock<IDocumentTransactWrite>();
+
+            transactWrite
+                .Setup(x => x.AddDocumentToPut(It.IsAny<Document>(), It.IsAny<TransactWriteItemOperationConfig>()))
+                .Callback((Document item, TransactWriteItemOperationConfig config) => itemsToSave.Add(item));
+
+            transactWrite
+                .Setup(x => x.Execute())
+                .Callback(() =>
+                {
+                    foreach (var item in itemsToSave)
+                    {
+                        inMemoryTable.Add(item);
+                    }
+                    itemsToSave.Clear();
+                });
+
+            return transactWrite.Object;
+        }
+
+        public IMultiTableDocumentTransactWrite CreateMultiTableDocumentTransactWrite()
+        {
+            var multiTransactWrite = new Mock<IMultiTableDocumentTransactWrite>();
+            var transactionParts = new List<IDocumentTransactWrite>();
+
+            multiTransactWrite
+                .Setup(x => x.AddTransactionPart(It.IsAny<IDocumentTransactWrite>()))
+                .Callback((IDocumentTransactWrite part) =>
+                {
+                    transactionParts.Add(part);
+                });
+
+            multiTransactWrite
+                .Setup(x => x.Execute())
+                .Callback(() =>
+                {
+                    foreach (var part in transactionParts)
+                    {
+                        part.Execute();
+                    }
+                });
+
+            return multiTransactWrite.Object;
+        }
+    }
+}