From e0ed9ed895c3737c04f2e463dbde122ed9e8ce5d Mon Sep 17 00:00:00 2001
From: root <root@aibox.dr4cul4.pl>
Date: Fri, 27 Feb 2026 09:53:20 +0100
Subject: [PATCH] Extend scoped typed select builder to deep join chains

---
 AmalgamationTool/DynamORM.Amalgamation.cs     | 1049 ++++++++++++-----
 .../TypedSql/TypedSqlScopeDslTests.cs         |   24 +
 .../IDynamicTypedSelectScopeQueryBuilder.cs   |   72 +-
 .../DynamicTypedSelectQueryBuilder.cs         |    8 +-
 .../DynamicTypedSelectScopeQueryBuilder.cs    |  869 ++++++++++----
 DynamORM/Builders/TypedScopeJoinBuilder.cs    |  202 ++--
 6 files changed, 1597 insertions(+), 627 deletions(-)

diff --git a/AmalgamationTool/DynamORM.Amalgamation.cs b/AmalgamationTool/DynamORM.Amalgamation.cs
index 51e5c7c..7289be2 100644
--- a/AmalgamationTool/DynamORM.Amalgamation.cs
+++ b/AmalgamationTool/DynamORM.Amalgamation.cs
@@ -7375,17 +7375,15 @@ namespace DynamORM
                 /// <summary>Add typed SQL DSL order-by expression using root and first four joined table contexts.</summary>
                 IDynamicTypedSelectQueryBuilder<T> OrderBySql<TJoin1, TJoin2, TJoin3, TJoin4>(Func<TypedTableContext<T>, TypedTableContext<TJoin1>, TypedTableContext<TJoin2>, TypedTableContext<TJoin3>, TypedTableContext<TJoin4>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T>, TypedTableContext<TJoin1>, TypedTableContext<TJoin2>, TypedTableContext<TJoin3>, TypedTableContext<TJoin4>, TypedSqlOrderExpression>[] selectors);
             }
-            /// <summary>Typed scope-based select builder with evolving join arity.</summary>
-            public interface IDynamicTypedSelectScopeQueryBuilder<T> : IDynamicSelectQueryBuilder
+            public interface IDynamicTypedSelectScopeQueryBuilder<T1> : IDynamicSelectQueryBuilder
             {
-                IDynamicTypedSelectScopeQueryBuilder<T, TJoin1> Join<TJoin1>(Func<TypedScopeJoinBuilder<T, TJoin1>, TypedScopeJoinBuilder<T, TJoin1>> specification);
-                IDynamicTypedSelectScopeQueryBuilder<T> SelectSql(Func<TypedTableContext<T>, TypedSqlSelectable> selector, params Func<TypedTableContext<T>, TypedSqlSelectable>[] selectors);
-                IDynamicTypedSelectScopeQueryBuilder<T> WhereSql(Func<TypedTableContext<T>, TypedSqlPredicate> predicate);
-                IDynamicTypedSelectScopeQueryBuilder<T> HavingSql(Func<TypedTableContext<T>, TypedSqlPredicate> predicate);
-                IDynamicTypedSelectScopeQueryBuilder<T> GroupBySql(Func<TypedTableContext<T>, TypedSqlExpression> selector, params Func<TypedTableContext<T>, TypedSqlExpression>[] selectors);
-                IDynamicTypedSelectScopeQueryBuilder<T> OrderBySql(Func<TypedTableContext<T>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T>, TypedSqlOrderExpression>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, TJoin2> Join<TJoin2>(Func<TypedScopeJoinBuilder<T1, TJoin2>, TypedScopeJoinBuilder<T1, TJoin2>> specification);
+                IDynamicTypedSelectScopeQueryBuilder<T1> SelectSql(Func<TypedTableContext<T1>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedSqlSelectable>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1> WhereSql(Func<TypedTableContext<T1>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1> HavingSql(Func<TypedTableContext<T1>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1> GroupBySql(Func<TypedTableContext<T1>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedSqlExpression>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1> OrderBySql(Func<TypedTableContext<T1>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedSqlOrderExpression>[] selectors);
             }
-            /// <summary>Typed scope-based select builder with two typed table contexts.</summary>
             public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2> : IDynamicSelectQueryBuilder
             {
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, TJoin3> Join<TJoin3>(Func<TypedScopeJoinBuilder<T1, T2, TJoin3>, TypedScopeJoinBuilder<T1, T2, TJoin3>> specification);
@@ -7395,7 +7393,6 @@ namespace DynamORM
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlExpression>[] selectors);
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlOrderExpression>[] selectors);
             }
-            /// <summary>Typed scope-based select builder with three typed table contexts.</summary>
             public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> : IDynamicSelectQueryBuilder
             {
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, TJoin4> Join<TJoin4>(Func<TypedScopeJoinBuilder<T1, T2, T3, TJoin4>, TypedScopeJoinBuilder<T1, T2, T3, TJoin4>> specification);
@@ -7405,7 +7402,6 @@ namespace DynamORM
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlExpression>[] selectors);
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlOrderExpression>[] selectors);
             }
-            /// <summary>Typed scope-based select builder with four typed table contexts.</summary>
             public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> : IDynamicSelectQueryBuilder
             {
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, TJoin5> Join<TJoin5>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, TJoin5>, TypedScopeJoinBuilder<T1, T2, T3, T4, TJoin5>> specification);
@@ -7415,15 +7411,59 @@ namespace DynamORM
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlExpression>[] selectors);
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlOrderExpression>[] selectors);
             }
-            /// <summary>Typed scope-based select builder with five typed table contexts.</summary>
             public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> : IDynamicSelectQueryBuilder
             {
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, TJoin6> Join<TJoin6>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>> specification);
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlSelectable>[] selectors);
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlPredicate> predicate);
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlPredicate> predicate);
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlExpression>[] selectors);
                 IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlOrderExpression>[] selectors);
             }
+            public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> : IDynamicSelectQueryBuilder
+            {
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, TJoin7> Join<TJoin7>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>> specification);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlSelectable>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlExpression>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlOrderExpression>[] selectors);
+            }
+            public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> : IDynamicSelectQueryBuilder
+            {
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8> Join<TJoin8>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>> specification);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlSelectable>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlExpression>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlOrderExpression>[] selectors);
+            }
+            public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> : IDynamicSelectQueryBuilder
+            {
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9> Join<TJoin9>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>> specification);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlSelectable>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlExpression>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlOrderExpression>[] selectors);
+            }
+            public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> : IDynamicSelectQueryBuilder
+            {
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10> Join<TJoin10>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>> specification);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlSelectable>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlExpression>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlOrderExpression>[] selectors);
+            }
+            public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : IDynamicSelectQueryBuilder
+            {
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlSelectable>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlPredicate> predicate);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlExpression>[] selectors);
+                IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlOrderExpression>[] selectors);
+            }
             /// <summary>Typed update query builder for mapped entities.</summary>
             /// <typeparam name="T">Mapped entity type.</typeparam>
             public interface IDynamicTypedUpdateQueryBuilder<T> : IDynamicUpdateQueryBuilder
@@ -7816,16 +7856,9 @@ namespace DynamORM
             public abstract class TypedScopeJoinBuilderBase<TSelf>
                 where TSelf : TypedScopeJoinBuilderBase<TSelf>
             {
-                /// <summary>Gets join alias.</summary>
                 public string Alias { get; private set; }
-
-                /// <summary>Gets join type.</summary>
                 public DynamicJoinType JoinType { get; private set; }
-
-                /// <summary>Gets custom join type text.</summary>
                 public string CustomJoinType { get; private set; }
-
-                /// <summary>Gets a value indicating whether joined source should use NOLOCK.</summary>
                 public bool UseNoLock { get; private set; }
 
                 protected TypedScopeJoinBuilderBase()
@@ -7837,59 +7870,19 @@ namespace DynamORM
                     Alias = alias;
                     return (TSelf)this;
                 }
-                public TSelf Inner()
-                {
-                    JoinType = DynamicJoinType.Inner;
-                    CustomJoinType = null;
-                    return (TSelf)this;
-                }
-                public TSelf Join()
-                {
-                    JoinType = DynamicJoinType.Join;
-                    CustomJoinType = null;
-                    return (TSelf)this;
-                }
-                public TSelf Left()
-                {
-                    JoinType = DynamicJoinType.Left;
-                    CustomJoinType = null;
-                    return (TSelf)this;
-                }
-                public TSelf Right()
-                {
-                    JoinType = DynamicJoinType.Right;
-                    CustomJoinType = null;
-                    return (TSelf)this;
-                }
-                public TSelf Full()
-                {
-                    JoinType = DynamicJoinType.Full;
-                    CustomJoinType = null;
-                    return (TSelf)this;
-                }
-                public TSelf LeftOuter()
-                {
-                    JoinType = DynamicJoinType.LeftOuter;
-                    CustomJoinType = null;
-                    return (TSelf)this;
-                }
-                public TSelf RightOuter()
-                {
-                    JoinType = DynamicJoinType.RightOuter;
-                    CustomJoinType = null;
-                    return (TSelf)this;
-                }
-                public TSelf FullOuter()
-                {
-                    JoinType = DynamicJoinType.FullOuter;
-                    CustomJoinType = null;
-                    return (TSelf)this;
-                }
+                public TSelf Inner() { JoinType = DynamicJoinType.Inner; CustomJoinType = null; return (TSelf)this; }
+                public TSelf Join() { JoinType = DynamicJoinType.Join; CustomJoinType = null; return (TSelf)this; }
+                public TSelf Left() { JoinType = DynamicJoinType.Left; CustomJoinType = null; return (TSelf)this; }
+                public TSelf Right() { JoinType = DynamicJoinType.Right; CustomJoinType = null; return (TSelf)this; }
+                public TSelf Full() { JoinType = DynamicJoinType.Full; CustomJoinType = null; return (TSelf)this; }
+                public TSelf LeftOuter() { JoinType = DynamicJoinType.LeftOuter; CustomJoinType = null; return (TSelf)this; }
+                public TSelf RightOuter() { JoinType = DynamicJoinType.RightOuter; CustomJoinType = null; return (TSelf)this; }
+                public TSelf FullOuter() { JoinType = DynamicJoinType.FullOuter; CustomJoinType = null; return (TSelf)this; }
+
                 public TSelf Type(string joinType)
                 {
                     if (string.IsNullOrEmpty(joinType))
                         throw new ArgumentNullException("joinType");
-
                     CustomJoinType = joinType.Trim();
                     return (TSelf)this;
                 }
@@ -7908,7 +7901,6 @@ namespace DynamORM
                 {
                     if (predicate == null)
                         throw new ArgumentNullException("predicate");
-
                     OnSqlPredicate = predicate;
                     OnRawCondition = null;
                     return this;
@@ -7917,7 +7909,6 @@ namespace DynamORM
                 {
                     if (string.IsNullOrEmpty(condition))
                         throw new ArgumentNullException("condition");
-
                     OnRawCondition = condition.Trim();
                     OnSqlPredicate = null;
                     return this;
@@ -7932,7 +7923,6 @@ namespace DynamORM
                 {
                     if (predicate == null)
                         throw new ArgumentNullException("predicate");
-
                     OnSqlPredicate = predicate;
                     OnRawCondition = null;
                     return this;
@@ -7941,7 +7931,6 @@ namespace DynamORM
                 {
                     if (string.IsNullOrEmpty(condition))
                         throw new ArgumentNullException("condition");
-
                     OnRawCondition = condition.Trim();
                     OnSqlPredicate = null;
                     return this;
@@ -7956,7 +7945,6 @@ namespace DynamORM
                 {
                     if (predicate == null)
                         throw new ArgumentNullException("predicate");
-
                     OnSqlPredicate = predicate;
                     OnRawCondition = null;
                     return this;
@@ -7965,7 +7953,6 @@ namespace DynamORM
                 {
                     if (string.IsNullOrEmpty(condition))
                         throw new ArgumentNullException("condition");
-
                     OnRawCondition = condition.Trim();
                     OnSqlPredicate = null;
                     return this;
@@ -7980,7 +7967,6 @@ namespace DynamORM
                 {
                     if (predicate == null)
                         throw new ArgumentNullException("predicate");
-
                     OnSqlPredicate = predicate;
                     OnRawCondition = null;
                     return this;
@@ -7989,7 +7975,116 @@ namespace DynamORM
                 {
                     if (string.IsNullOrEmpty(condition))
                         throw new ArgumentNullException("condition");
+                    OnRawCondition = condition.Trim();
+                    OnSqlPredicate = null;
+                    return this;
+                }
+            }
+            public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TRight>>
+            {
+                internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+                internal string OnRawCondition { get; private set; }
 
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+                {
+                    if (predicate == null)
+                        throw new ArgumentNullException("predicate");
+                    OnSqlPredicate = predicate;
+                    OnRawCondition = null;
+                    return this;
+                }
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TRight> OnRaw(string condition)
+                {
+                    if (string.IsNullOrEmpty(condition))
+                        throw new ArgumentNullException("condition");
+                    OnRawCondition = condition.Trim();
+                    OnSqlPredicate = null;
+                    return this;
+                }
+            }
+            public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TRight>>
+            {
+                internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+                internal string OnRawCondition { get; private set; }
+
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+                {
+                    if (predicate == null)
+                        throw new ArgumentNullException("predicate");
+                    OnSqlPredicate = predicate;
+                    OnRawCondition = null;
+                    return this;
+                }
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TRight> OnRaw(string condition)
+                {
+                    if (string.IsNullOrEmpty(condition))
+                        throw new ArgumentNullException("condition");
+                    OnRawCondition = condition.Trim();
+                    OnSqlPredicate = null;
+                    return this;
+                }
+            }
+            public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TRight>>
+            {
+                internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+                internal string OnRawCondition { get; private set; }
+
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+                {
+                    if (predicate == null)
+                        throw new ArgumentNullException("predicate");
+                    OnSqlPredicate = predicate;
+                    OnRawCondition = null;
+                    return this;
+                }
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TRight> OnRaw(string condition)
+                {
+                    if (string.IsNullOrEmpty(condition))
+                        throw new ArgumentNullException("condition");
+                    OnRawCondition = condition.Trim();
+                    OnSqlPredicate = null;
+                    return this;
+                }
+            }
+            public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TRight>>
+            {
+                internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+                internal string OnRawCondition { get; private set; }
+
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+                {
+                    if (predicate == null)
+                        throw new ArgumentNullException("predicate");
+                    OnSqlPredicate = predicate;
+                    OnRawCondition = null;
+                    return this;
+                }
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TRight> OnRaw(string condition)
+                {
+                    if (string.IsNullOrEmpty(condition))
+                        throw new ArgumentNullException("condition");
+                    OnRawCondition = condition.Trim();
+                    OnSqlPredicate = null;
+                    return this;
+                }
+            }
+            public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TRight>>
+            {
+                internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+                internal string OnRawCondition { get; private set; }
+
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+                {
+                    if (predicate == null)
+                        throw new ArgumentNullException("predicate");
+                    OnSqlPredicate = predicate;
+                    OnRawCondition = null;
+                    return this;
+                }
+                public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TRight> OnRaw(string condition)
+                {
+                    if (string.IsNullOrEmpty(condition))
+                        throw new ArgumentNullException("condition");
                     OnRawCondition = condition.Trim();
                     OnSqlPredicate = null;
                     return this;
@@ -11749,7 +11844,7 @@ namespace DynamORM
 
                         AddSelectSqlSelector(selector(GetRootContext()));
                     }
-                    private void AddSelectSqlSelector(TypedSqlSelectable item)
+                    internal void AddSelectSqlSelector(TypedSqlSelectable item)
                     {
                         if (item == null)
                             throw new ArgumentNullException("item");
@@ -11783,7 +11878,7 @@ namespace DynamORM
 
                         AddGroupBySqlSelector(selector(GetRootContext()));
                     }
-                    private void AddGroupBySqlSelector(TypedSqlExpression item)
+                    internal void AddGroupBySqlSelector(TypedSqlExpression item)
                     {
                         if (item == null)
                             throw new ArgumentNullException("item");
@@ -11813,7 +11908,7 @@ namespace DynamORM
 
                         AddOrderBySqlSelector(selector(GetRootContext()));
                     }
-                    private void AddOrderBySqlSelector(TypedSqlOrderExpression item)
+                    internal void AddOrderBySqlSelector(TypedSqlOrderExpression item)
                     {
                         TypedSqlRenderContext context = new TypedSqlRenderContext(this);
                         string rendered = item.Render(context);
@@ -12020,7 +12115,7 @@ namespace DynamORM
                             Alias = alias
                         });
                     }
-                    private void AppendSqlCondition(string condition, bool having)
+                    internal void AppendSqlCondition(string condition, bool having)
                     {
                         if (having)
                         {
@@ -12244,193 +12339,46 @@ namespace DynamORM
                     public List<Action<IParameter, IDbDataParameter>> OnCreateParameter { get { return Builder.OnCreateParameter; } set { Builder.OnCreateParameter = value; } }
                     public bool IsDisposed { get { return Builder.IsDisposed; } }
 
-                    public void Dispose()
-                    {
-                        Builder.Dispose();
-                    }
-                    public IDbCommand FillCommand(IDbCommand command)
-                    {
-                        return Builder.FillCommand(command);
-                    }
-                    public string CommandText()
-                    {
-                        return Builder.CommandText();
-                    }
-                    public IEnumerable<dynamic> Execute()
-                    {
-                        return Builder.Execute();
-                    }
-                    public IEnumerable<T> Execute<T>() where T : class
-                    {
-                        return Builder.Execute<T>();
-                    }
-                    public void ExecuteDataReader(Action<IDataReader> reader)
-                    {
-                        Builder.ExecuteDataReader(reader);
-                    }
-                    public object Scalar()
-                    {
-                        return Builder.Scalar();
-                    }
+                    public void Dispose() { Builder.Dispose(); }
+                    public IDbCommand FillCommand(IDbCommand command) { return Builder.FillCommand(command); }
+                    public string CommandText() { return Builder.CommandText(); }
+                    public IEnumerable<dynamic> Execute() { return Builder.Execute(); }
+                    public IEnumerable<T> Execute<T>() where T : class { return Builder.Execute<T>(); }
+                    public void ExecuteDataReader(Action<IDataReader> reader) { Builder.ExecuteDataReader(reader); }
+                    public object Scalar() { return Builder.Scalar(); }
             #if !DYNAMORM_OMMIT_GENERICEXECUTION && !DYNAMORM_OMMIT_TRYPARSE
-                    public TResult ScalarAs<TResult>(TResult defaultValue = default(TResult))
-                    {
-                        return Builder.ScalarAs(defaultValue);
-                    }
+                    public TResult ScalarAs<TResult>(TResult defaultValue = default(TResult)) { return Builder.ScalarAs(defaultValue); }
             #endif
+                    public IDynamicSelectQueryBuilder From(Func<dynamic, object> fn, params Func<dynamic, object>[] func) { Builder.From(fn, func); return this; }
+                    public IDynamicSelectQueryBuilder Join(params Func<dynamic, object>[] func) { Builder.Join(func); return this; }
+                    public IDynamicSelectQueryBuilder Where(Func<dynamic, object> func) { Builder.Where(func); return this; }
+                    public IDynamicSelectQueryBuilder Where(DynamicColumn column) { Builder.Where(column); return this; }
+                    public IDynamicSelectQueryBuilder Where(string column, DynamicColumn.CompareOperator op, object value) { Builder.Where(column, op, value); return this; }
+                    public IDynamicSelectQueryBuilder Where(string column, object value) { Builder.Where(column, value); return this; }
+                    public IDynamicSelectQueryBuilder Where(object conditions, bool schema = false) { Builder.Where(conditions, schema); return this; }
+                    public IDynamicSelectQueryBuilder Select(Func<dynamic, object> fn, params Func<dynamic, object>[] func) { Builder.Select(fn, func); return this; }
+                    public IDynamicSelectQueryBuilder SelectColumn(params DynamicColumn[] columns) { Builder.SelectColumn(columns); return this; }
+                    public IDynamicSelectQueryBuilder SelectColumn(params string[] columns) { Builder.SelectColumn(columns); return this; }
+                    public IDynamicSelectQueryBuilder GroupBy(Func<dynamic, object> fn, params Func<dynamic, object>[] func) { Builder.GroupBy(fn, func); return this; }
+                    public IDynamicSelectQueryBuilder GroupByColumn(params DynamicColumn[] columns) { Builder.GroupByColumn(columns); return this; }
+                    public IDynamicSelectQueryBuilder GroupByColumn(params string[] columns) { Builder.GroupByColumn(columns); return this; }
+                    public IDynamicSelectQueryBuilder Having(Func<dynamic, object> func) { Builder.Having(func); return this; }
+                    public IDynamicSelectQueryBuilder Having(DynamicColumn column) { Builder.Having(column); return this; }
+                    public IDynamicSelectQueryBuilder Having(string column, DynamicColumn.CompareOperator op, object value) { Builder.Having(column, op, value); return this; }
+                    public IDynamicSelectQueryBuilder Having(string column, object value) { Builder.Having(column, value); return this; }
+                    public IDynamicSelectQueryBuilder Having(object conditions, bool schema = false) { Builder.Having(conditions, schema); return this; }
+                    public IDynamicSelectQueryBuilder OrderBy(Func<dynamic, object> fn, params Func<dynamic, object>[] func) { Builder.OrderBy(fn, func); return this; }
+                    public IDynamicSelectQueryBuilder OrderByColumn(params DynamicColumn[] columns) { Builder.OrderByColumn(columns); return this; }
+                    public IDynamicSelectQueryBuilder OrderByColumn(params string[] columns) { Builder.OrderByColumn(columns); return this; }
+                    public IDynamicSelectQueryBuilder Top(int? top) { Builder.Top(top); return this; }
+                    public IDynamicSelectQueryBuilder Limit(int? limit) { Builder.Limit(limit); return this; }
+                    public IDynamicSelectQueryBuilder Offset(int? offset) { Builder.Offset(offset); return this; }
+                    public IDynamicSelectQueryBuilder Distinct(bool distinct = true) { Builder.Distinct(distinct); return this; }
 
-                    public IDynamicSelectQueryBuilder From(Func<dynamic, object> fn, params Func<dynamic, object>[] func)
-                    {
-                        Builder.From(fn, func);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Join(params Func<dynamic, object>[] func)
-                    {
-                        Builder.Join(func);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Where(Func<dynamic, object> func)
-                    {
-                        Builder.Where(func);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Where(DynamicColumn column)
-                    {
-                        Builder.Where(column);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Where(string column, DynamicColumn.CompareOperator op, object value)
-                    {
-                        Builder.Where(column, op, value);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Where(string column, object value)
-                    {
-                        Builder.Where(column, value);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Where(object conditions, bool schema = false)
-                    {
-                        Builder.Where(conditions, schema);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Select(Func<dynamic, object> fn, params Func<dynamic, object>[] func)
-                    {
-                        Builder.Select(fn, func);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder SelectColumn(params DynamicColumn[] columns)
-                    {
-                        Builder.SelectColumn(columns);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder SelectColumn(params string[] columns)
-                    {
-                        Builder.SelectColumn(columns);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder GroupBy(Func<dynamic, object> fn, params Func<dynamic, object>[] func)
-                    {
-                        Builder.GroupBy(fn, func);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder GroupByColumn(params DynamicColumn[] columns)
-                    {
-                        Builder.GroupByColumn(columns);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder GroupByColumn(params string[] columns)
-                    {
-                        Builder.GroupByColumn(columns);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Having(Func<dynamic, object> func)
-                    {
-                        Builder.Having(func);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Having(DynamicColumn column)
-                    {
-                        Builder.Having(column);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Having(string column, DynamicColumn.CompareOperator op, object value)
-                    {
-                        Builder.Having(column, op, value);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Having(string column, object value)
-                    {
-                        Builder.Having(column, value);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Having(object conditions, bool schema = false)
-                    {
-                        Builder.Having(conditions, schema);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder OrderBy(Func<dynamic, object> fn, params Func<dynamic, object>[] func)
-                    {
-                        Builder.OrderBy(fn, func);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder OrderByColumn(params DynamicColumn[] columns)
-                    {
-                        Builder.OrderByColumn(columns);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder OrderByColumn(params string[] columns)
-                    {
-                        Builder.OrderByColumn(columns);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Top(int? top)
-                    {
-                        Builder.Top(top);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Limit(int? limit)
-                    {
-                        Builder.Limit(limit);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Offset(int? offset)
-                    {
-                        Builder.Offset(offset);
-                        return this;
-                    }
-                    public IDynamicSelectQueryBuilder Distinct(bool distinct = true)
-                    {
-                        Builder.Distinct(distinct);
-                        return this;
-                    }
-                    protected string GetJoinKeyword(DynamicJoinType joinType)
-                    {
-                        switch (joinType)
-                        {
-                            case DynamicJoinType.Join:
-                                return "JOIN";
-                            case DynamicJoinType.Left:
-                                return "LEFT JOIN";
-                            case DynamicJoinType.Right:
-                                return "RIGHT JOIN";
-                            case DynamicJoinType.Full:
-                                return "FULL JOIN";
-                            case DynamicJoinType.LeftOuter:
-                                return "LEFT OUTER JOIN";
-                            case DynamicJoinType.RightOuter:
-                                return "RIGHT OUTER JOIN";
-                            case DynamicJoinType.FullOuter:
-                                return "FULL OUTER JOIN";
-                            default:
-                                return "INNER JOIN";
-                        }
-                    }
                     protected TypedJoinBuilder<TRoot, TJoin> ApplyJoinSpec<TJoin>(TypedJoinBuilder<TRoot, TJoin> builder, string alias, string customJoinType, DynamicJoinType joinType, bool noLock, string condition)
                     {
                         if (!string.IsNullOrEmpty(alias))
                             builder.As(alias);
-
                         if (!string.IsNullOrEmpty(customJoinType))
                             builder.Type(customJoinType);
                         else
@@ -12449,12 +12397,15 @@ namespace DynamORM
                         }
                         if (noLock)
                             builder.NoLock();
-
                         if (!string.IsNullOrEmpty(condition))
                             builder.OnRaw(condition);
-
                         return builder;
                     }
+                    protected void AddSelect(TypedSqlSelectable item) { Builder.AddSelectSqlSelector(item); }
+                    protected void AddGroupBy(TypedSqlExpression item) { Builder.AddGroupBySqlSelector(item); }
+                    protected void AddOrderBy(TypedSqlOrderExpression item) { Builder.AddOrderBySqlSelector(item); }
+                    protected void AddWhere(TypedSqlPredicate predicate) { Builder.AppendSqlCondition(Builder.RenderScopeSqlPredicate(predicate), false); }
+                    protected void AddHaving(TypedSqlPredicate predicate) { Builder.AppendSqlCondition(Builder.RenderScopeSqlPredicate(predicate), true); }
                 }
                 internal sealed class DynamicTypedSelectScopeQueryBuilder<T1> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1>
                 {
@@ -12465,43 +12416,62 @@ namespace DynamORM
                     {
                         _alias1 = alias1;
                     }
-                    public IDynamicTypedSelectScopeQueryBuilder<T1, TJoin1> Join<TJoin1>(Func<TypedScopeJoinBuilder<T1, TJoin1>, TypedScopeJoinBuilder<T1, TJoin1>> specification)
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, TJoin2> Join<TJoin2>(Func<TypedScopeJoinBuilder<T1, TJoin2>, TypedScopeJoinBuilder<T1, TJoin2>> specification)
                     {
                         if (specification == null)
                             throw new ArgumentNullException("specification");
 
-                        TypedScopeJoinBuilder<T1, TJoin1> spec = specification(new TypedScopeJoinBuilder<T1, TJoin1>());
+                        TypedScopeJoinBuilder<T1, TJoin2> spec = specification(new TypedScopeJoinBuilder<T1, TJoin2>());
                         if (spec == null)
                             throw new ArgumentException("Join specification cannot resolve to null.", "specification");
 
                         string alias = string.IsNullOrEmpty(spec.Alias) ? "t2" : spec.Alias;
-                        string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<TJoin1>(alias)));
-                        Builder.Join<TJoin1>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
-                        return new DynamicTypedSelectScopeQueryBuilder<T1, TJoin1>(Builder, _alias1, alias);
+                        string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<TJoin2>(alias)));
+                        Builder.Join<TJoin2>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+                        return new DynamicTypedSelectScopeQueryBuilder<T1, TJoin2>(Builder, _alias1, alias);
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1> SelectSql(Func<TypedTableContext<T1>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedSqlSelectable>[] selectors)
                     {
-                        Builder.SelectSql(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1> WhereSql(Func<TypedTableContext<T1>, TypedSqlPredicate> predicate)
                     {
-                        Builder.WhereSql(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1> HavingSql(Func<TypedTableContext<T1>, TypedSqlPredicate> predicate)
                     {
-                        Builder.HavingSql(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1> GroupBySql(Func<TypedTableContext<T1>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedSqlExpression>[] selectors)
                     {
-                        Builder.GroupBySql(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1> OrderBySql(Func<TypedTableContext<T1>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedSqlOrderExpression>[] selectors)
                     {
-                        Builder.OrderBySql(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1)));
                         return this;
                     }
                 }
@@ -12532,27 +12502,46 @@ namespace DynamORM
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlSelectable>[] selectors)
                     {
-                        Builder.SelectSql<T2>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlPredicate> predicate)
                     {
-                        Builder.WhereSql<T2>(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlPredicate> predicate)
                     {
-                        Builder.HavingSql<T2>(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlExpression>[] selectors)
                     {
-                        Builder.GroupBySql<T2>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlOrderExpression>[] selectors)
                     {
-                        Builder.OrderBySql<T2>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
                         return this;
                     }
                 }
@@ -12585,27 +12574,46 @@ namespace DynamORM
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlSelectable>[] selectors)
                     {
-                        Builder.SelectSql<T2, T3>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlPredicate> predicate)
                     {
-                        Builder.WhereSql<T2, T3>(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlPredicate> predicate)
                     {
-                        Builder.HavingSql<T2, T3>(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlExpression>[] selectors)
                     {
-                        Builder.GroupBySql<T2, T3>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlOrderExpression>[] selectors)
                     {
-                        Builder.OrderBySql<T2, T3>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
                         return this;
                     }
                 }
@@ -12640,59 +12648,518 @@ namespace DynamORM
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlSelectable>[] selectors)
                     {
-                        Builder.SelectSql<T2, T3, T4>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlPredicate> predicate)
                     {
-                        Builder.WhereSql<T2, T3, T4>(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlPredicate> predicate)
                     {
-                        Builder.HavingSql<T2, T3, T4>(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlExpression>[] selectors)
                     {
-                        Builder.GroupBySql<T2, T3, T4>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlOrderExpression>[] selectors)
                     {
-                        Builder.OrderBySql<T2, T3, T4>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
                         return this;
                     }
                 }
                 internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5>
                 {
+                    private readonly string _alias1;
+                    private readonly string _alias2;
+                    private readonly string _alias3;
+                    private readonly string _alias4;
+                    private readonly string _alias5;
+
                     internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5)
                         : base(builder)
                     {
+                        _alias1 = alias1;
+                        _alias2 = alias2;
+                        _alias3 = alias3;
+                        _alias4 = alias4;
+                        _alias5 = alias5;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, TJoin6> Join<TJoin6>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>> specification)
+                    {
+                        if (specification == null)
+                            throw new ArgumentNullException("specification");
+
+                        TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>());
+                        if (spec == null)
+                            throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+                        string alias = string.IsNullOrEmpty(spec.Alias) ? "t6" : spec.Alias;
+                        string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<TJoin6>(alias)));
+                        Builder.Join<TJoin6>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+                        return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, TJoin6>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, alias);
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlSelectable>[] selectors)
                     {
-                        Builder.SelectSql<T2, T3, T4, T5>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlPredicate> predicate)
                     {
-                        Builder.WhereSql<T2, T3, T4, T5>(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlPredicate> predicate)
                     {
-                        Builder.HavingSql<T2, T3, T4, T5>(predicate);
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlExpression>[] selectors)
                     {
-                        Builder.GroupBySql<T2, T3, T4, T5>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
                         return this;
                     }
                     public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlOrderExpression>[] selectors)
                     {
-                        Builder.OrderBySql<T2, T3, T4, T5>(selector, selectors);
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
+                        return this;
+                    }
+                }
+                internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6>
+                {
+                    private readonly string _alias1;
+                    private readonly string _alias2;
+                    private readonly string _alias3;
+                    private readonly string _alias4;
+                    private readonly string _alias5;
+                    private readonly string _alias6;
+
+                    internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6)
+                        : base(builder)
+                    {
+                        _alias1 = alias1;
+                        _alias2 = alias2;
+                        _alias3 = alias3;
+                        _alias4 = alias4;
+                        _alias5 = alias5;
+                        _alias6 = alias6;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, TJoin7> Join<TJoin7>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>> specification)
+                    {
+                        if (specification == null)
+                            throw new ArgumentNullException("specification");
+
+                        TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>());
+                        if (spec == null)
+                            throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+                        string alias = string.IsNullOrEmpty(spec.Alias) ? "t7" : spec.Alias;
+                        string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<TJoin7>(alias)));
+                        Builder.Join<TJoin7>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+                        return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, TJoin7>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, _alias6, alias);
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlSelectable>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlOrderExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+                        return this;
+                    }
+                }
+                internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7>
+                {
+                    private readonly string _alias1;
+                    private readonly string _alias2;
+                    private readonly string _alias3;
+                    private readonly string _alias4;
+                    private readonly string _alias5;
+                    private readonly string _alias6;
+                    private readonly string _alias7;
+
+                    internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6, string alias7)
+                        : base(builder)
+                    {
+                        _alias1 = alias1;
+                        _alias2 = alias2;
+                        _alias3 = alias3;
+                        _alias4 = alias4;
+                        _alias5 = alias5;
+                        _alias6 = alias6;
+                        _alias7 = alias7;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8> Join<TJoin8>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>> specification)
+                    {
+                        if (specification == null)
+                            throw new ArgumentNullException("specification");
+
+                        TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>());
+                        if (spec == null)
+                            throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+                        string alias = string.IsNullOrEmpty(spec.Alias) ? "t8" : spec.Alias;
+                        string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<TJoin8>(alias)));
+                        Builder.Join<TJoin8>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+                        return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, _alias6, _alias7, alias);
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlSelectable>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlOrderExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+                        return this;
+                    }
+                }
+                internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8>
+                {
+                    private readonly string _alias1;
+                    private readonly string _alias2;
+                    private readonly string _alias3;
+                    private readonly string _alias4;
+                    private readonly string _alias5;
+                    private readonly string _alias6;
+                    private readonly string _alias7;
+                    private readonly string _alias8;
+
+                    internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6, string alias7, string alias8)
+                        : base(builder)
+                    {
+                        _alias1 = alias1;
+                        _alias2 = alias2;
+                        _alias3 = alias3;
+                        _alias4 = alias4;
+                        _alias5 = alias5;
+                        _alias6 = alias6;
+                        _alias7 = alias7;
+                        _alias8 = alias8;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9> Join<TJoin9>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>> specification)
+                    {
+                        if (specification == null)
+                            throw new ArgumentNullException("specification");
+
+                        TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>());
+                        if (spec == null)
+                            throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+                        string alias = string.IsNullOrEmpty(spec.Alias) ? "t9" : spec.Alias;
+                        string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<TJoin9>(alias)));
+                        Builder.Join<TJoin9>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+                        return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, _alias6, _alias7, _alias8, alias);
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlSelectable>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlOrderExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+                        return this;
+                    }
+                }
+                internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9>
+                {
+                    private readonly string _alias1;
+                    private readonly string _alias2;
+                    private readonly string _alias3;
+                    private readonly string _alias4;
+                    private readonly string _alias5;
+                    private readonly string _alias6;
+                    private readonly string _alias7;
+                    private readonly string _alias8;
+                    private readonly string _alias9;
+
+                    internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6, string alias7, string alias8, string alias9)
+                        : base(builder)
+                    {
+                        _alias1 = alias1;
+                        _alias2 = alias2;
+                        _alias3 = alias3;
+                        _alias4 = alias4;
+                        _alias5 = alias5;
+                        _alias6 = alias6;
+                        _alias7 = alias7;
+                        _alias8 = alias8;
+                        _alias9 = alias9;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10> Join<TJoin10>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>> specification)
+                    {
+                        if (specification == null)
+                            throw new ArgumentNullException("specification");
+
+                        TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>());
+                        if (spec == null)
+                            throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+                        string alias = string.IsNullOrEmpty(spec.Alias) ? "t10" : spec.Alias;
+                        string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<TJoin10>(alias)));
+                        Builder.Join<TJoin10>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+                        return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, _alias6, _alias7, _alias8, _alias9, alias);
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlSelectable>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlOrderExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+                        return this;
+                    }
+                }
+                internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
+                {
+                    private readonly string _alias1;
+                    private readonly string _alias2;
+                    private readonly string _alias3;
+                    private readonly string _alias4;
+                    private readonly string _alias5;
+                    private readonly string _alias6;
+                    private readonly string _alias7;
+                    private readonly string _alias8;
+                    private readonly string _alias9;
+                    private readonly string _alias10;
+
+                    internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6, string alias7, string alias8, string alias9, string alias10)
+                        : base(builder)
+                    {
+                        _alias1 = alias1;
+                        _alias2 = alias2;
+                        _alias3 = alias3;
+                        _alias4 = alias4;
+                        _alias5 = alias5;
+                        _alias6 = alias6;
+                        _alias7 = alias7;
+                        _alias8 = alias8;
+                        _alias9 = alias9;
+                        _alias10 = alias10;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlSelectable>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlPredicate> predicate)
+                    {
+                        if (predicate == null)
+                            throw new ArgumentNullException("predicate");
+                        AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+                        return this;
+                    }
+                    public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlOrderExpression>[] selectors)
+                    {
+                        if (selector == null)
+                            throw new ArgumentNullException("selector");
+                        AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+                        if (selectors != null)
+                            foreach (var item in selectors)
+                                AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
                         return this;
                     }
                 }
diff --git a/DynamORM.Tests/TypedSql/TypedSqlScopeDslTests.cs b/DynamORM.Tests/TypedSql/TypedSqlScopeDslTests.cs
index bab0937..95b21f5 100644
--- a/DynamORM.Tests/TypedSql/TypedSqlScopeDslTests.cs
+++ b/DynamORM.Tests/TypedSql/TypedSqlScopeDslTests.cs
@@ -122,5 +122,29 @@ namespace DynamORM.Tests.TypedSql
                 "SELECT u.\"Id_User\" AS \"user_id\", d.\"Department_Name\" AS \"department_name\" FROM \"dbo\".\"Users\" AS u LEFT JOIN \"dbo\".\"UserClients\" AS c ON (u.\"Id_User\" = c.\"User_Id\") LEFT JOIN \"dbo\".\"UserRoles\" AS r ON (c.\"User_Id\" = r.\"User_Id\") LEFT JOIN \"dbo\".\"UserRegions\" AS g ON (r.\"User_Id\" = g.\"User_Id\") LEFT JOIN \"dbo\".\"UserDepartments\" AS d ON (g.\"Region_Id\" = d.\"Region_Id\") WHERE (d.\"Department_Id\" > [$0]) ORDER BY d.\"Department_Name\" ASC",
                 NormalizeSql(cmd.CommandText()));
         }
+
+        [Test]
+        public void TestScopeBuilderSupportsTenTypedTables()
+        {
+            var cmd = Database.FromTypedScope<TypedFluentUser>("a")
+                .Join<TypedFluentUser>(j => j.Left().As("b").OnSql((a, b) => a.Col(x => x.Id).Eq(b.Col(x => x.Id))))
+                .Join<TypedFluentUser>(j => j.Left().As("c").OnSql((a, b, c) => b.Col(x => x.Id).Eq(c.Col(x => x.Id))))
+                .Join<TypedFluentUser>(j => j.Left().As("d").OnSql((a, b, c, d) => c.Col(x => x.Id).Eq(d.Col(x => x.Id))))
+                .Join<TypedFluentUser>(j => j.Left().As("e").OnSql((a, b, c, d, e) => d.Col(x => x.Id).Eq(e.Col(x => x.Id))))
+                .Join<TypedFluentUser>(j => j.Left().As("f").OnSql((a, b, c, d, e, f) => e.Col(x => x.Id).Eq(f.Col(x => x.Id))))
+                .Join<TypedFluentUser>(j => j.Left().As("g").OnSql((a, b, c, d, e, f, g) => f.Col(x => x.Id).Eq(g.Col(x => x.Id))))
+                .Join<TypedFluentUser>(j => j.Left().As("h").OnSql((a, b, c, d, e, f, g, h) => g.Col(x => x.Id).Eq(h.Col(x => x.Id))))
+                .Join<TypedFluentUser>(j => j.Left().As("i").OnSql((a, b, c, d, e, f, g, h, i) => h.Col(x => x.Id).Eq(i.Col(x => x.Id))))
+                .Join<TypedFluentUser>(j => j.Left().As("j").OnSql((a, b, c, d, e, f, g, h, i, j) => i.Col(x => x.Id).Eq(j.Col(x => x.Id))))
+                .SelectSql(
+                    (a, b, c, d, e, f, g, h, i, j) => a.Col(x => x.Id).As("root_id"),
+                    (a, b, c, d, e, f, g, h, i, j) => j.Col(x => x.Code).As("last_code"))
+                .WhereSql((a, b, c, d, e, f, g, h, i, j) => j.Col(x => x.Code).IsNotNull())
+                .OrderBySql((a, b, c, d, e, f, g, h, i, j) => j.Col(x => x.Code).Asc());
+
+            Assert.AreEqual(
+                "SELECT a.\"id_user\" AS \"root_id\", j.\"user_code\" AS \"last_code\" FROM \"sample_users\" AS a LEFT JOIN \"sample_users\" AS b ON (a.\"id_user\" = b.\"id_user\") LEFT JOIN \"sample_users\" AS c ON (b.\"id_user\" = c.\"id_user\") LEFT JOIN \"sample_users\" AS d ON (c.\"id_user\" = d.\"id_user\") LEFT JOIN \"sample_users\" AS e ON (d.\"id_user\" = e.\"id_user\") LEFT JOIN \"sample_users\" AS f ON (e.\"id_user\" = f.\"id_user\") LEFT JOIN \"sample_users\" AS g ON (f.\"id_user\" = g.\"id_user\") LEFT JOIN \"sample_users\" AS h ON (g.\"id_user\" = h.\"id_user\") LEFT JOIN \"sample_users\" AS i ON (h.\"id_user\" = i.\"id_user\") LEFT JOIN \"sample_users\" AS j ON (i.\"id_user\" = j.\"id_user\") WHERE (j.\"user_code\" IS NOT NULL) ORDER BY j.\"user_code\" ASC",
+                NormalizeSql(cmd.CommandText()));
+        }
     }
 }
diff --git a/DynamORM/Builders/IDynamicTypedSelectScopeQueryBuilder.cs b/DynamORM/Builders/IDynamicTypedSelectScopeQueryBuilder.cs
index 9802ea9..78e6e9c 100644
--- a/DynamORM/Builders/IDynamicTypedSelectScopeQueryBuilder.cs
+++ b/DynamORM/Builders/IDynamicTypedSelectScopeQueryBuilder.cs
@@ -9,18 +9,16 @@ using DynamORM.TypedSql;
 
 namespace DynamORM.Builders
 {
-    /// <summary>Typed scope-based select builder with evolving join arity.</summary>
-    public interface IDynamicTypedSelectScopeQueryBuilder<T> : IDynamicSelectQueryBuilder
+    public interface IDynamicTypedSelectScopeQueryBuilder<T1> : IDynamicSelectQueryBuilder
     {
-        IDynamicTypedSelectScopeQueryBuilder<T, TJoin1> Join<TJoin1>(Func<TypedScopeJoinBuilder<T, TJoin1>, TypedScopeJoinBuilder<T, TJoin1>> specification);
-        IDynamicTypedSelectScopeQueryBuilder<T> SelectSql(Func<TypedTableContext<T>, TypedSqlSelectable> selector, params Func<TypedTableContext<T>, TypedSqlSelectable>[] selectors);
-        IDynamicTypedSelectScopeQueryBuilder<T> WhereSql(Func<TypedTableContext<T>, TypedSqlPredicate> predicate);
-        IDynamicTypedSelectScopeQueryBuilder<T> HavingSql(Func<TypedTableContext<T>, TypedSqlPredicate> predicate);
-        IDynamicTypedSelectScopeQueryBuilder<T> GroupBySql(Func<TypedTableContext<T>, TypedSqlExpression> selector, params Func<TypedTableContext<T>, TypedSqlExpression>[] selectors);
-        IDynamicTypedSelectScopeQueryBuilder<T> OrderBySql(Func<TypedTableContext<T>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T>, TypedSqlOrderExpression>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, TJoin2> Join<TJoin2>(Func<TypedScopeJoinBuilder<T1, TJoin2>, TypedScopeJoinBuilder<T1, TJoin2>> specification);
+        IDynamicTypedSelectScopeQueryBuilder<T1> SelectSql(Func<TypedTableContext<T1>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedSqlSelectable>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1> WhereSql(Func<TypedTableContext<T1>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1> HavingSql(Func<TypedTableContext<T1>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1> GroupBySql(Func<TypedTableContext<T1>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedSqlExpression>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1> OrderBySql(Func<TypedTableContext<T1>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedSqlOrderExpression>[] selectors);
     }
 
-    /// <summary>Typed scope-based select builder with two typed table contexts.</summary>
     public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2> : IDynamicSelectQueryBuilder
     {
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, TJoin3> Join<TJoin3>(Func<TypedScopeJoinBuilder<T1, T2, TJoin3>, TypedScopeJoinBuilder<T1, T2, TJoin3>> specification);
@@ -31,7 +29,6 @@ namespace DynamORM.Builders
         IDynamicTypedSelectScopeQueryBuilder<T1, T2> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlOrderExpression>[] selectors);
     }
 
-    /// <summary>Typed scope-based select builder with three typed table contexts.</summary>
     public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> : IDynamicSelectQueryBuilder
     {
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, TJoin4> Join<TJoin4>(Func<TypedScopeJoinBuilder<T1, T2, T3, TJoin4>, TypedScopeJoinBuilder<T1, T2, T3, TJoin4>> specification);
@@ -42,7 +39,6 @@ namespace DynamORM.Builders
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlOrderExpression>[] selectors);
     }
 
-    /// <summary>Typed scope-based select builder with four typed table contexts.</summary>
     public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> : IDynamicSelectQueryBuilder
     {
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, TJoin5> Join<TJoin5>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, TJoin5>, TypedScopeJoinBuilder<T1, T2, T3, T4, TJoin5>> specification);
@@ -53,13 +49,63 @@ namespace DynamORM.Builders
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlOrderExpression>[] selectors);
     }
 
-    /// <summary>Typed scope-based select builder with five typed table contexts.</summary>
     public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> : IDynamicSelectQueryBuilder
     {
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, TJoin6> Join<TJoin6>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>> specification);
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlSelectable>[] selectors);
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlPredicate> predicate);
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlPredicate> predicate);
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlExpression>[] selectors);
         IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlOrderExpression>[] selectors);
     }
-}
+
+    public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> : IDynamicSelectQueryBuilder
+    {
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, TJoin7> Join<TJoin7>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>> specification);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlSelectable>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlExpression>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlOrderExpression>[] selectors);
+    }
+
+    public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> : IDynamicSelectQueryBuilder
+    {
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8> Join<TJoin8>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>> specification);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlSelectable>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlExpression>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlOrderExpression>[] selectors);
+    }
+
+    public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> : IDynamicSelectQueryBuilder
+    {
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9> Join<TJoin9>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>> specification);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlSelectable>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlExpression>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlOrderExpression>[] selectors);
+    }
+
+    public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> : IDynamicSelectQueryBuilder
+    {
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10> Join<TJoin10>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>> specification);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlSelectable>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlExpression>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlOrderExpression>[] selectors);
+    }
+
+    public interface IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : IDynamicSelectQueryBuilder
+    {
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlSelectable>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlPredicate> predicate);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlExpression>[] selectors);
+        IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlOrderExpression>[] selectors);
+    }
+
+}
\ No newline at end of file
diff --git a/DynamORM/Builders/Implementation/DynamicTypedSelectQueryBuilder.cs b/DynamORM/Builders/Implementation/DynamicTypedSelectQueryBuilder.cs
index 7bed59e..5b02ad4 100644
--- a/DynamORM/Builders/Implementation/DynamicTypedSelectQueryBuilder.cs
+++ b/DynamORM/Builders/Implementation/DynamicTypedSelectQueryBuilder.cs
@@ -678,7 +678,7 @@ namespace DynamORM.Builders.Implementation
             AddSelectSqlSelector(selector(GetRootContext()));
         }
 
-        private void AddSelectSqlSelector(TypedSqlSelectable item)
+        internal void AddSelectSqlSelector(TypedSqlSelectable item)
         {
             if (item == null)
                 throw new ArgumentNullException("item");
@@ -715,7 +715,7 @@ namespace DynamORM.Builders.Implementation
             AddGroupBySqlSelector(selector(GetRootContext()));
         }
 
-        private void AddGroupBySqlSelector(TypedSqlExpression item)
+        internal void AddGroupBySqlSelector(TypedSqlExpression item)
         {
             if (item == null)
                 throw new ArgumentNullException("item");
@@ -749,7 +749,7 @@ namespace DynamORM.Builders.Implementation
             AddOrderBySqlSelector(selector(GetRootContext()));
         }
 
-        private void AddOrderBySqlSelector(TypedSqlOrderExpression item)
+        internal void AddOrderBySqlSelector(TypedSqlOrderExpression item)
         {
             TypedSqlRenderContext context = new TypedSqlRenderContext(this);
             string rendered = item.Render(context);
@@ -976,7 +976,7 @@ namespace DynamORM.Builders.Implementation
             });
         }
 
-        private void AppendSqlCondition(string condition, bool having)
+        internal void AppendSqlCondition(string condition, bool having)
         {
             if (having)
             {
diff --git a/DynamORM/Builders/Implementation/DynamicTypedSelectScopeQueryBuilder.cs b/DynamORM/Builders/Implementation/DynamicTypedSelectScopeQueryBuilder.cs
index f2bb702..3e4e532 100644
--- a/DynamORM/Builders/Implementation/DynamicTypedSelectScopeQueryBuilder.cs
+++ b/DynamORM/Builders/Implementation/DynamicTypedSelectScopeQueryBuilder.cs
@@ -30,226 +30,46 @@ namespace DynamORM.Builders.Implementation
         public List<Action<IParameter, IDbDataParameter>> OnCreateParameter { get { return Builder.OnCreateParameter; } set { Builder.OnCreateParameter = value; } }
         public bool IsDisposed { get { return Builder.IsDisposed; } }
 
-        public void Dispose()
-        {
-            Builder.Dispose();
-        }
-
-        public IDbCommand FillCommand(IDbCommand command)
-        {
-            return Builder.FillCommand(command);
-        }
-
-        public string CommandText()
-        {
-            return Builder.CommandText();
-        }
-
-        public IEnumerable<dynamic> Execute()
-        {
-            return Builder.Execute();
-        }
-
-        public IEnumerable<T> Execute<T>() where T : class
-        {
-            return Builder.Execute<T>();
-        }
-
-        public void ExecuteDataReader(Action<IDataReader> reader)
-        {
-            Builder.ExecuteDataReader(reader);
-        }
-
-        public object Scalar()
-        {
-            return Builder.Scalar();
-        }
-
+        public void Dispose() { Builder.Dispose(); }
+        public IDbCommand FillCommand(IDbCommand command) { return Builder.FillCommand(command); }
+        public string CommandText() { return Builder.CommandText(); }
+        public IEnumerable<dynamic> Execute() { return Builder.Execute(); }
+        public IEnumerable<T> Execute<T>() where T : class { return Builder.Execute<T>(); }
+        public void ExecuteDataReader(Action<IDataReader> reader) { Builder.ExecuteDataReader(reader); }
+        public object Scalar() { return Builder.Scalar(); }
 #if !DYNAMORM_OMMIT_GENERICEXECUTION && !DYNAMORM_OMMIT_TRYPARSE
-        public TResult ScalarAs<TResult>(TResult defaultValue = default(TResult))
-        {
-            return Builder.ScalarAs(defaultValue);
-        }
+        public TResult ScalarAs<TResult>(TResult defaultValue = default(TResult)) { return Builder.ScalarAs(defaultValue); }
 #endif
-
-        public IDynamicSelectQueryBuilder From(Func<dynamic, object> fn, params Func<dynamic, object>[] func)
-        {
-            Builder.From(fn, func);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Join(params Func<dynamic, object>[] func)
-        {
-            Builder.Join(func);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Where(Func<dynamic, object> func)
-        {
-            Builder.Where(func);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Where(DynamicColumn column)
-        {
-            Builder.Where(column);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Where(string column, DynamicColumn.CompareOperator op, object value)
-        {
-            Builder.Where(column, op, value);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Where(string column, object value)
-        {
-            Builder.Where(column, value);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Where(object conditions, bool schema = false)
-        {
-            Builder.Where(conditions, schema);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Select(Func<dynamic, object> fn, params Func<dynamic, object>[] func)
-        {
-            Builder.Select(fn, func);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder SelectColumn(params DynamicColumn[] columns)
-        {
-            Builder.SelectColumn(columns);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder SelectColumn(params string[] columns)
-        {
-            Builder.SelectColumn(columns);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder GroupBy(Func<dynamic, object> fn, params Func<dynamic, object>[] func)
-        {
-            Builder.GroupBy(fn, func);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder GroupByColumn(params DynamicColumn[] columns)
-        {
-            Builder.GroupByColumn(columns);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder GroupByColumn(params string[] columns)
-        {
-            Builder.GroupByColumn(columns);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Having(Func<dynamic, object> func)
-        {
-            Builder.Having(func);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Having(DynamicColumn column)
-        {
-            Builder.Having(column);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Having(string column, DynamicColumn.CompareOperator op, object value)
-        {
-            Builder.Having(column, op, value);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Having(string column, object value)
-        {
-            Builder.Having(column, value);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Having(object conditions, bool schema = false)
-        {
-            Builder.Having(conditions, schema);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder OrderBy(Func<dynamic, object> fn, params Func<dynamic, object>[] func)
-        {
-            Builder.OrderBy(fn, func);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder OrderByColumn(params DynamicColumn[] columns)
-        {
-            Builder.OrderByColumn(columns);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder OrderByColumn(params string[] columns)
-        {
-            Builder.OrderByColumn(columns);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Top(int? top)
-        {
-            Builder.Top(top);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Limit(int? limit)
-        {
-            Builder.Limit(limit);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Offset(int? offset)
-        {
-            Builder.Offset(offset);
-            return this;
-        }
-
-        public IDynamicSelectQueryBuilder Distinct(bool distinct = true)
-        {
-            Builder.Distinct(distinct);
-            return this;
-        }
-
-        protected string GetJoinKeyword(DynamicJoinType joinType)
-        {
-            switch (joinType)
-            {
-                case DynamicJoinType.Join:
-                    return "JOIN";
-                case DynamicJoinType.Left:
-                    return "LEFT JOIN";
-                case DynamicJoinType.Right:
-                    return "RIGHT JOIN";
-                case DynamicJoinType.Full:
-                    return "FULL JOIN";
-                case DynamicJoinType.LeftOuter:
-                    return "LEFT OUTER JOIN";
-                case DynamicJoinType.RightOuter:
-                    return "RIGHT OUTER JOIN";
-                case DynamicJoinType.FullOuter:
-                    return "FULL OUTER JOIN";
-                default:
-                    return "INNER JOIN";
-            }
-        }
+        public IDynamicSelectQueryBuilder From(Func<dynamic, object> fn, params Func<dynamic, object>[] func) { Builder.From(fn, func); return this; }
+        public IDynamicSelectQueryBuilder Join(params Func<dynamic, object>[] func) { Builder.Join(func); return this; }
+        public IDynamicSelectQueryBuilder Where(Func<dynamic, object> func) { Builder.Where(func); return this; }
+        public IDynamicSelectQueryBuilder Where(DynamicColumn column) { Builder.Where(column); return this; }
+        public IDynamicSelectQueryBuilder Where(string column, DynamicColumn.CompareOperator op, object value) { Builder.Where(column, op, value); return this; }
+        public IDynamicSelectQueryBuilder Where(string column, object value) { Builder.Where(column, value); return this; }
+        public IDynamicSelectQueryBuilder Where(object conditions, bool schema = false) { Builder.Where(conditions, schema); return this; }
+        public IDynamicSelectQueryBuilder Select(Func<dynamic, object> fn, params Func<dynamic, object>[] func) { Builder.Select(fn, func); return this; }
+        public IDynamicSelectQueryBuilder SelectColumn(params DynamicColumn[] columns) { Builder.SelectColumn(columns); return this; }
+        public IDynamicSelectQueryBuilder SelectColumn(params string[] columns) { Builder.SelectColumn(columns); return this; }
+        public IDynamicSelectQueryBuilder GroupBy(Func<dynamic, object> fn, params Func<dynamic, object>[] func) { Builder.GroupBy(fn, func); return this; }
+        public IDynamicSelectQueryBuilder GroupByColumn(params DynamicColumn[] columns) { Builder.GroupByColumn(columns); return this; }
+        public IDynamicSelectQueryBuilder GroupByColumn(params string[] columns) { Builder.GroupByColumn(columns); return this; }
+        public IDynamicSelectQueryBuilder Having(Func<dynamic, object> func) { Builder.Having(func); return this; }
+        public IDynamicSelectQueryBuilder Having(DynamicColumn column) { Builder.Having(column); return this; }
+        public IDynamicSelectQueryBuilder Having(string column, DynamicColumn.CompareOperator op, object value) { Builder.Having(column, op, value); return this; }
+        public IDynamicSelectQueryBuilder Having(string column, object value) { Builder.Having(column, value); return this; }
+        public IDynamicSelectQueryBuilder Having(object conditions, bool schema = false) { Builder.Having(conditions, schema); return this; }
+        public IDynamicSelectQueryBuilder OrderBy(Func<dynamic, object> fn, params Func<dynamic, object>[] func) { Builder.OrderBy(fn, func); return this; }
+        public IDynamicSelectQueryBuilder OrderByColumn(params DynamicColumn[] columns) { Builder.OrderByColumn(columns); return this; }
+        public IDynamicSelectQueryBuilder OrderByColumn(params string[] columns) { Builder.OrderByColumn(columns); return this; }
+        public IDynamicSelectQueryBuilder Top(int? top) { Builder.Top(top); return this; }
+        public IDynamicSelectQueryBuilder Limit(int? limit) { Builder.Limit(limit); return this; }
+        public IDynamicSelectQueryBuilder Offset(int? offset) { Builder.Offset(offset); return this; }
+        public IDynamicSelectQueryBuilder Distinct(bool distinct = true) { Builder.Distinct(distinct); return this; }
 
         protected TypedJoinBuilder<TRoot, TJoin> ApplyJoinSpec<TJoin>(TypedJoinBuilder<TRoot, TJoin> builder, string alias, string customJoinType, DynamicJoinType joinType, bool noLock, string condition)
         {
             if (!string.IsNullOrEmpty(alias))
                 builder.As(alias);
-
             if (!string.IsNullOrEmpty(customJoinType))
                 builder.Type(customJoinType);
             else
@@ -266,15 +86,18 @@ namespace DynamORM.Builders.Implementation
                     default: builder.Inner(); break;
                 }
             }
-
             if (noLock)
                 builder.NoLock();
-
             if (!string.IsNullOrEmpty(condition))
                 builder.OnRaw(condition);
-
             return builder;
         }
+
+        protected void AddSelect(TypedSqlSelectable item) { Builder.AddSelectSqlSelector(item); }
+        protected void AddGroupBy(TypedSqlExpression item) { Builder.AddGroupBySqlSelector(item); }
+        protected void AddOrderBy(TypedSqlOrderExpression item) { Builder.AddOrderBySqlSelector(item); }
+        protected void AddWhere(TypedSqlPredicate predicate) { Builder.AppendSqlCondition(Builder.RenderScopeSqlPredicate(predicate), false); }
+        protected void AddHaving(TypedSqlPredicate predicate) { Builder.AppendSqlCondition(Builder.RenderScopeSqlPredicate(predicate), true); }
     }
 
     internal sealed class DynamicTypedSelectScopeQueryBuilder<T1> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1>
@@ -287,48 +110,67 @@ namespace DynamORM.Builders.Implementation
             _alias1 = alias1;
         }
 
-        public IDynamicTypedSelectScopeQueryBuilder<T1, TJoin1> Join<TJoin1>(Func<TypedScopeJoinBuilder<T1, TJoin1>, TypedScopeJoinBuilder<T1, TJoin1>> specification)
+        public IDynamicTypedSelectScopeQueryBuilder<T1, TJoin2> Join<TJoin2>(Func<TypedScopeJoinBuilder<T1, TJoin2>, TypedScopeJoinBuilder<T1, TJoin2>> specification)
         {
             if (specification == null)
                 throw new ArgumentNullException("specification");
 
-            TypedScopeJoinBuilder<T1, TJoin1> spec = specification(new TypedScopeJoinBuilder<T1, TJoin1>());
+            TypedScopeJoinBuilder<T1, TJoin2> spec = specification(new TypedScopeJoinBuilder<T1, TJoin2>());
             if (spec == null)
                 throw new ArgumentException("Join specification cannot resolve to null.", "specification");
 
             string alias = string.IsNullOrEmpty(spec.Alias) ? "t2" : spec.Alias;
-            string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<TJoin1>(alias)));
-            Builder.Join<TJoin1>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
-            return new DynamicTypedSelectScopeQueryBuilder<T1, TJoin1>(Builder, _alias1, alias);
+            string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<TJoin2>(alias)));
+            Builder.Join<TJoin2>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+            return new DynamicTypedSelectScopeQueryBuilder<T1, TJoin2>(Builder, _alias1, alias);
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1> SelectSql(Func<TypedTableContext<T1>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedSqlSelectable>[] selectors)
         {
-            Builder.SelectSql(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1> WhereSql(Func<TypedTableContext<T1>, TypedSqlPredicate> predicate)
         {
-            Builder.WhereSql(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1> HavingSql(Func<TypedTableContext<T1>, TypedSqlPredicate> predicate)
         {
-            Builder.HavingSql(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1> GroupBySql(Func<TypedTableContext<T1>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedSqlExpression>[] selectors)
         {
-            Builder.GroupBySql(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1> OrderBySql(Func<TypedTableContext<T1>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedSqlOrderExpression>[] selectors)
         {
-            Builder.OrderBySql(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1)));
             return this;
         }
     }
@@ -362,31 +204,50 @@ namespace DynamORM.Builders.Implementation
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlSelectable>[] selectors)
         {
-            Builder.SelectSql<T2>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlPredicate> predicate)
         {
-            Builder.WhereSql<T2>(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlPredicate> predicate)
         {
-            Builder.HavingSql<T2>(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlExpression>[] selectors)
         {
-            Builder.GroupBySql<T2>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedSqlOrderExpression>[] selectors)
         {
-            Builder.OrderBySql<T2>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2)));
             return this;
         }
     }
@@ -422,31 +283,50 @@ namespace DynamORM.Builders.Implementation
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlSelectable>[] selectors)
         {
-            Builder.SelectSql<T2, T3>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlPredicate> predicate)
         {
-            Builder.WhereSql<T2, T3>(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlPredicate> predicate)
         {
-            Builder.HavingSql<T2, T3>(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlExpression>[] selectors)
         {
-            Builder.GroupBySql<T2, T3>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedSqlOrderExpression>[] selectors)
         {
-            Builder.OrderBySql<T2, T3>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3)));
             return this;
         }
     }
@@ -484,70 +364,565 @@ namespace DynamORM.Builders.Implementation
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlSelectable>[] selectors)
         {
-            Builder.SelectSql<T2, T3, T4>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlPredicate> predicate)
         {
-            Builder.WhereSql<T2, T3, T4>(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlPredicate> predicate)
         {
-            Builder.HavingSql<T2, T3, T4>(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlExpression>[] selectors)
         {
-            Builder.GroupBySql<T2, T3, T4>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedSqlOrderExpression>[] selectors)
         {
-            Builder.OrderBySql<T2, T3, T4>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4)));
             return this;
         }
     }
 
     internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5>
     {
+        private readonly string _alias1;
+        private readonly string _alias2;
+        private readonly string _alias3;
+        private readonly string _alias4;
+        private readonly string _alias5;
+
         internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5)
             : base(builder)
         {
+            _alias1 = alias1;
+            _alias2 = alias2;
+            _alias3 = alias3;
+            _alias4 = alias4;
+            _alias5 = alias5;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, TJoin6> Join<TJoin6>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>> specification)
+        {
+            if (specification == null)
+                throw new ArgumentNullException("specification");
+
+            TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TJoin6>());
+            if (spec == null)
+                throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+            string alias = string.IsNullOrEmpty(spec.Alias) ? "t6" : spec.Alias;
+            string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<TJoin6>(alias)));
+            Builder.Join<TJoin6>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+            return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, TJoin6>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, alias);
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlSelectable>[] selectors)
         {
-            Builder.SelectSql<T2, T3, T4, T5>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlPredicate> predicate)
         {
-            Builder.WhereSql<T2, T3, T4, T5>(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlPredicate> predicate)
         {
-            Builder.HavingSql<T2, T3, T4, T5>(predicate);
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlExpression>[] selectors)
         {
-            Builder.GroupBySql<T2, T3, T4, T5>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
             return this;
         }
 
         public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedSqlOrderExpression>[] selectors)
         {
-            Builder.OrderBySql<T2, T3, T4, T5>(selector, selectors);
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5)));
             return this;
         }
     }
-}
+
+    internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6>
+    {
+        private readonly string _alias1;
+        private readonly string _alias2;
+        private readonly string _alias3;
+        private readonly string _alias4;
+        private readonly string _alias5;
+        private readonly string _alias6;
+
+        internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6)
+            : base(builder)
+        {
+            _alias1 = alias1;
+            _alias2 = alias2;
+            _alias3 = alias3;
+            _alias4 = alias4;
+            _alias5 = alias5;
+            _alias6 = alias6;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, TJoin7> Join<TJoin7>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>> specification)
+        {
+            if (specification == null)
+                throw new ArgumentNullException("specification");
+
+            TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TJoin7>());
+            if (spec == null)
+                throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+            string alias = string.IsNullOrEmpty(spec.Alias) ? "t7" : spec.Alias;
+            string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<TJoin7>(alias)));
+            Builder.Join<TJoin7>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+            return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, TJoin7>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, _alias6, alias);
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlSelectable>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedSqlOrderExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6)));
+            return this;
+        }
+    }
+
+    internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7>
+    {
+        private readonly string _alias1;
+        private readonly string _alias2;
+        private readonly string _alias3;
+        private readonly string _alias4;
+        private readonly string _alias5;
+        private readonly string _alias6;
+        private readonly string _alias7;
+
+        internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6, string alias7)
+            : base(builder)
+        {
+            _alias1 = alias1;
+            _alias2 = alias2;
+            _alias3 = alias3;
+            _alias4 = alias4;
+            _alias5 = alias5;
+            _alias6 = alias6;
+            _alias7 = alias7;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8> Join<TJoin8>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>> specification)
+        {
+            if (specification == null)
+                throw new ArgumentNullException("specification");
+
+            TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>());
+            if (spec == null)
+                throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+            string alias = string.IsNullOrEmpty(spec.Alias) ? "t8" : spec.Alias;
+            string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<TJoin8>(alias)));
+            Builder.Join<TJoin8>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+            return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, TJoin8>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, _alias6, _alias7, alias);
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlSelectable>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedSqlOrderExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7)));
+            return this;
+        }
+    }
+
+    internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8>
+    {
+        private readonly string _alias1;
+        private readonly string _alias2;
+        private readonly string _alias3;
+        private readonly string _alias4;
+        private readonly string _alias5;
+        private readonly string _alias6;
+        private readonly string _alias7;
+        private readonly string _alias8;
+
+        internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6, string alias7, string alias8)
+            : base(builder)
+        {
+            _alias1 = alias1;
+            _alias2 = alias2;
+            _alias3 = alias3;
+            _alias4 = alias4;
+            _alias5 = alias5;
+            _alias6 = alias6;
+            _alias7 = alias7;
+            _alias8 = alias8;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9> Join<TJoin9>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>> specification)
+        {
+            if (specification == null)
+                throw new ArgumentNullException("specification");
+
+            TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>());
+            if (spec == null)
+                throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+            string alias = string.IsNullOrEmpty(spec.Alias) ? "t9" : spec.Alias;
+            string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<TJoin9>(alias)));
+            Builder.Join<TJoin9>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+            return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TJoin9>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, _alias6, _alias7, _alias8, alias);
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlSelectable>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedSqlOrderExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8)));
+            return this;
+        }
+    }
+
+    internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9>
+    {
+        private readonly string _alias1;
+        private readonly string _alias2;
+        private readonly string _alias3;
+        private readonly string _alias4;
+        private readonly string _alias5;
+        private readonly string _alias6;
+        private readonly string _alias7;
+        private readonly string _alias8;
+        private readonly string _alias9;
+
+        internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6, string alias7, string alias8, string alias9)
+            : base(builder)
+        {
+            _alias1 = alias1;
+            _alias2 = alias2;
+            _alias3 = alias3;
+            _alias4 = alias4;
+            _alias5 = alias5;
+            _alias6 = alias6;
+            _alias7 = alias7;
+            _alias8 = alias8;
+            _alias9 = alias9;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10> Join<TJoin10>(Func<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>, TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>> specification)
+        {
+            if (specification == null)
+                throw new ArgumentNullException("specification");
+
+            TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10> spec = specification(new TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>());
+            if (spec == null)
+                throw new ArgumentException("Join specification cannot resolve to null.", "specification");
+
+            string alias = string.IsNullOrEmpty(spec.Alias) ? "t10" : spec.Alias;
+            string condition = spec.OnSqlPredicate == null ? spec.OnRawCondition : Builder.RenderScopeSqlPredicate(spec.OnSqlPredicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<TJoin10>(alias)));
+            Builder.Join<TJoin10>(j => ApplyJoinSpec(j, alias, spec.CustomJoinType, spec.JoinType, spec.UseNoLock, condition));
+            return new DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TJoin10>(Builder, _alias1, _alias2, _alias3, _alias4, _alias5, _alias6, _alias7, _alias8, _alias9, alias);
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlSelectable>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedSqlOrderExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9)));
+            return this;
+        }
+    }
+
+    internal sealed class DynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : DynamicTypedSelectScopeQueryBuilderBase<T1>, IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
+    {
+        private readonly string _alias1;
+        private readonly string _alias2;
+        private readonly string _alias3;
+        private readonly string _alias4;
+        private readonly string _alias5;
+        private readonly string _alias6;
+        private readonly string _alias7;
+        private readonly string _alias8;
+        private readonly string _alias9;
+        private readonly string _alias10;
+
+        internal DynamicTypedSelectScopeQueryBuilder(DynamicTypedSelectQueryBuilder<T1> builder, string alias1, string alias2, string alias3, string alias4, string alias5, string alias6, string alias7, string alias8, string alias9, string alias10)
+            : base(builder)
+        {
+            _alias1 = alias1;
+            _alias2 = alias2;
+            _alias3 = alias3;
+            _alias4 = alias4;
+            _alias5 = alias5;
+            _alias6 = alias6;
+            _alias7 = alias7;
+            _alias8 = alias8;
+            _alias9 = alias9;
+            _alias10 = alias10;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> SelectSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlSelectable> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlSelectable>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddSelect(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddSelect(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WhereSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddWhere(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> HavingSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            AddHaving(predicate(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddGroupBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddGroupBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+            return this;
+        }
+
+        public IDynamicTypedSelectScopeQueryBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBySql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlOrderExpression> selector, params Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<T10>, TypedSqlOrderExpression>[] selectors)
+        {
+            if (selector == null)
+                throw new ArgumentNullException("selector");
+            AddOrderBy(selector(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+            if (selectors != null)
+                foreach (var item in selectors)
+                    AddOrderBy(item(new TypedTableContext<T1>(_alias1), new TypedTableContext<T2>(_alias2), new TypedTableContext<T3>(_alias3), new TypedTableContext<T4>(_alias4), new TypedTableContext<T5>(_alias5), new TypedTableContext<T6>(_alias6), new TypedTableContext<T7>(_alias7), new TypedTableContext<T8>(_alias8), new TypedTableContext<T9>(_alias9), new TypedTableContext<T10>(_alias10)));
+            return this;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/DynamORM/Builders/TypedScopeJoinBuilder.cs b/DynamORM/Builders/TypedScopeJoinBuilder.cs
index 8be2509..7f00084 100644
--- a/DynamORM/Builders/TypedScopeJoinBuilder.cs
+++ b/DynamORM/Builders/TypedScopeJoinBuilder.cs
@@ -12,16 +12,9 @@ namespace DynamORM.Builders
     public abstract class TypedScopeJoinBuilderBase<TSelf>
         where TSelf : TypedScopeJoinBuilderBase<TSelf>
     {
-        /// <summary>Gets join alias.</summary>
         public string Alias { get; private set; }
-
-        /// <summary>Gets join type.</summary>
         public DynamicJoinType JoinType { get; private set; }
-
-        /// <summary>Gets custom join type text.</summary>
         public string CustomJoinType { get; private set; }
-
-        /// <summary>Gets a value indicating whether joined source should use NOLOCK.</summary>
         public bool UseNoLock { get; private set; }
 
         protected TypedScopeJoinBuilderBase()
@@ -35,67 +28,19 @@ namespace DynamORM.Builders
             return (TSelf)this;
         }
 
-        public TSelf Inner()
-        {
-            JoinType = DynamicJoinType.Inner;
-            CustomJoinType = null;
-            return (TSelf)this;
-        }
-
-        public TSelf Join()
-        {
-            JoinType = DynamicJoinType.Join;
-            CustomJoinType = null;
-            return (TSelf)this;
-        }
-
-        public TSelf Left()
-        {
-            JoinType = DynamicJoinType.Left;
-            CustomJoinType = null;
-            return (TSelf)this;
-        }
-
-        public TSelf Right()
-        {
-            JoinType = DynamicJoinType.Right;
-            CustomJoinType = null;
-            return (TSelf)this;
-        }
-
-        public TSelf Full()
-        {
-            JoinType = DynamicJoinType.Full;
-            CustomJoinType = null;
-            return (TSelf)this;
-        }
-
-        public TSelf LeftOuter()
-        {
-            JoinType = DynamicJoinType.LeftOuter;
-            CustomJoinType = null;
-            return (TSelf)this;
-        }
-
-        public TSelf RightOuter()
-        {
-            JoinType = DynamicJoinType.RightOuter;
-            CustomJoinType = null;
-            return (TSelf)this;
-        }
-
-        public TSelf FullOuter()
-        {
-            JoinType = DynamicJoinType.FullOuter;
-            CustomJoinType = null;
-            return (TSelf)this;
-        }
+        public TSelf Inner() { JoinType = DynamicJoinType.Inner; CustomJoinType = null; return (TSelf)this; }
+        public TSelf Join() { JoinType = DynamicJoinType.Join; CustomJoinType = null; return (TSelf)this; }
+        public TSelf Left() { JoinType = DynamicJoinType.Left; CustomJoinType = null; return (TSelf)this; }
+        public TSelf Right() { JoinType = DynamicJoinType.Right; CustomJoinType = null; return (TSelf)this; }
+        public TSelf Full() { JoinType = DynamicJoinType.Full; CustomJoinType = null; return (TSelf)this; }
+        public TSelf LeftOuter() { JoinType = DynamicJoinType.LeftOuter; CustomJoinType = null; return (TSelf)this; }
+        public TSelf RightOuter() { JoinType = DynamicJoinType.RightOuter; CustomJoinType = null; return (TSelf)this; }
+        public TSelf FullOuter() { JoinType = DynamicJoinType.FullOuter; CustomJoinType = null; return (TSelf)this; }
 
         public TSelf Type(string joinType)
         {
             if (string.IsNullOrEmpty(joinType))
                 throw new ArgumentNullException("joinType");
-
             CustomJoinType = joinType.Trim();
             return (TSelf)this;
         }
@@ -116,7 +61,6 @@ namespace DynamORM.Builders
         {
             if (predicate == null)
                 throw new ArgumentNullException("predicate");
-
             OnSqlPredicate = predicate;
             OnRawCondition = null;
             return this;
@@ -126,7 +70,6 @@ namespace DynamORM.Builders
         {
             if (string.IsNullOrEmpty(condition))
                 throw new ArgumentNullException("condition");
-
             OnRawCondition = condition.Trim();
             OnSqlPredicate = null;
             return this;
@@ -142,7 +85,6 @@ namespace DynamORM.Builders
         {
             if (predicate == null)
                 throw new ArgumentNullException("predicate");
-
             OnSqlPredicate = predicate;
             OnRawCondition = null;
             return this;
@@ -152,7 +94,6 @@ namespace DynamORM.Builders
         {
             if (string.IsNullOrEmpty(condition))
                 throw new ArgumentNullException("condition");
-
             OnRawCondition = condition.Trim();
             OnSqlPredicate = null;
             return this;
@@ -168,7 +109,6 @@ namespace DynamORM.Builders
         {
             if (predicate == null)
                 throw new ArgumentNullException("predicate");
-
             OnSqlPredicate = predicate;
             OnRawCondition = null;
             return this;
@@ -178,7 +118,6 @@ namespace DynamORM.Builders
         {
             if (string.IsNullOrEmpty(condition))
                 throw new ArgumentNullException("condition");
-
             OnRawCondition = condition.Trim();
             OnSqlPredicate = null;
             return this;
@@ -194,7 +133,6 @@ namespace DynamORM.Builders
         {
             if (predicate == null)
                 throw new ArgumentNullException("predicate");
-
             OnSqlPredicate = predicate;
             OnRawCondition = null;
             return this;
@@ -204,10 +142,130 @@ namespace DynamORM.Builders
         {
             if (string.IsNullOrEmpty(condition))
                 throw new ArgumentNullException("condition");
-
             OnRawCondition = condition.Trim();
             OnSqlPredicate = null;
             return this;
         }
     }
-}
+
+    public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TRight>>
+    {
+        internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+        internal string OnRawCondition { get; private set; }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            OnSqlPredicate = predicate;
+            OnRawCondition = null;
+            return this;
+        }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, TRight> OnRaw(string condition)
+        {
+            if (string.IsNullOrEmpty(condition))
+                throw new ArgumentNullException("condition");
+            OnRawCondition = condition.Trim();
+            OnSqlPredicate = null;
+            return this;
+        }
+    }
+
+    public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TRight>>
+    {
+        internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+        internal string OnRawCondition { get; private set; }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            OnSqlPredicate = predicate;
+            OnRawCondition = null;
+            return this;
+        }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, TRight> OnRaw(string condition)
+        {
+            if (string.IsNullOrEmpty(condition))
+                throw new ArgumentNullException("condition");
+            OnRawCondition = condition.Trim();
+            OnSqlPredicate = null;
+            return this;
+        }
+    }
+
+    public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TRight>>
+    {
+        internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+        internal string OnRawCondition { get; private set; }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            OnSqlPredicate = predicate;
+            OnRawCondition = null;
+            return this;
+        }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, TRight> OnRaw(string condition)
+        {
+            if (string.IsNullOrEmpty(condition))
+                throw new ArgumentNullException("condition");
+            OnRawCondition = condition.Trim();
+            OnSqlPredicate = null;
+            return this;
+        }
+    }
+
+    public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TRight>>
+    {
+        internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+        internal string OnRawCondition { get; private set; }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            OnSqlPredicate = predicate;
+            OnRawCondition = null;
+            return this;
+        }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, TRight> OnRaw(string condition)
+        {
+            if (string.IsNullOrEmpty(condition))
+                throw new ArgumentNullException("condition");
+            OnRawCondition = condition.Trim();
+            OnSqlPredicate = null;
+            return this;
+        }
+    }
+
+    public sealed class TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TRight> : TypedScopeJoinBuilderBase<TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TRight>>
+    {
+        internal Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<TRight>, TypedSqlPredicate> OnSqlPredicate { get; private set; }
+        internal string OnRawCondition { get; private set; }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TRight> OnSql(Func<TypedTableContext<T1>, TypedTableContext<T2>, TypedTableContext<T3>, TypedTableContext<T4>, TypedTableContext<T5>, TypedTableContext<T6>, TypedTableContext<T7>, TypedTableContext<T8>, TypedTableContext<T9>, TypedTableContext<TRight>, TypedSqlPredicate> predicate)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException("predicate");
+            OnSqlPredicate = predicate;
+            OnRawCondition = null;
+            return this;
+        }
+
+        public TypedScopeJoinBuilder<T1, T2, T3, T4, T5, T6, T7, T8, T9, TRight> OnRaw(string condition)
+        {
+            if (string.IsNullOrEmpty(condition))
+                throw new ArgumentNullException("condition");
+            OnRawCondition = condition.Trim();
+            OnSqlPredicate = null;
+            return this;
+        }
+    }
+
+}
\ No newline at end of file