diff --git a/Madd0.AzureStorageDriver/DataContextTemplate.cs b/Madd0.AzureStorageDriver/DataContextTemplate.cs
index f7930b2..ef57f67 100644
--- a/Madd0.AzureStorageDriver/DataContextTemplate.cs
+++ b/Madd0.AzureStorageDriver/DataContextTemplate.cs
@@ -111,9 +111,11 @@ public class ");
             
             #line default
             #line hidden
-            this.Write("    }\r\n\r\n");
+            this.Write("\r\n        public TableQuery<TElement> MakeTableQuery<TElement>()\r\n            whe" +
+                    "re TElement : ITableEntity\r\n        {\r\n            return new TableQuery<TElemen" +
+                    "t>();\r\n        }\r\n    }\r\n\r\n");
             
-            #line 48 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
+            #line 54 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
 
 foreach (var table in this.Tables)
 {
@@ -123,14 +125,14 @@ public class ");
             #line hidden
             this.Write("    public class ");
             
-            #line 52 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
+            #line 58 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(table.Name));
             
             #line default
             #line hidden
             this.Write("Entity : TableEntity\r\n    {\r\n    ");
             
-            #line 54 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
+            #line 60 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
 
     foreach (var column in table.Columns)
     {
@@ -142,21 +144,21 @@ public class ");
             #line hidden
             this.Write("        public ");
             
-            #line 60 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
+            #line 66 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(column.TypeName));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 60 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
+            #line 66 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(column.Name));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            get;\r\n            set;\r\n        }\r\n    ");
             
-            #line 65 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
+            #line 71 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
 
         }
     }
@@ -166,7 +168,7 @@ public class ");
             #line hidden
             this.Write("    }\r\n");
             
-            #line 70 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
+            #line 76 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
 
 }
 
@@ -177,7 +179,7 @@ public class ");
             return this.GenerationEnvironment.ToString();
         }
         
-        #line 75 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
+        #line 81 "C:\Projects\AzureStorageDriver\Madd0.AzureStorageDriver\DataContextTemplate.tt"
 
 private readonly List<string> DefaultProperties = new List<string> { "PartitionKey", "RowKey", "Timestamp", "ETag" };
 
diff --git a/Madd0.AzureStorageDriver/DataContextTemplate.tt b/Madd0.AzureStorageDriver/DataContextTemplate.tt
index 4fa8c03..c0fffa5 100644
--- a/Madd0.AzureStorageDriver/DataContextTemplate.tt
+++ b/Madd0.AzureStorageDriver/DataContextTemplate.tt
@@ -43,6 +43,12 @@ foreach (var table in this.Tables)
 <#
 }
 #>
+
+        public TableQuery<TElement> MakeTableQuery<TElement>()
+            where TElement : ITableEntity
+        {
+            return new TableQuery<TElement>();
+        }
     }
 
 <#
diff --git a/Madd0.AzureStorageDriver/UserQuery/ExtendedTableQuery.cs b/Madd0.AzureStorageDriver/UserQuery/ExtendedTableQuery.cs
index f974000..efb7a15 100644
--- a/Madd0.AzureStorageDriver/UserQuery/ExtendedTableQuery.cs
+++ b/Madd0.AzureStorageDriver/UserQuery/ExtendedTableQuery.cs
@@ -168,5 +168,13 @@ public int? TakeCount
                 return _query.TakeCount;
             }
         }
+
+        public CloudTable CloudTable
+        {
+            get
+            {
+                return _table;
+            }
+        }
     }
 }