diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt
index 3338173..274d911 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt
@@ -2,9 +2,11 @@ package ru.landgrafhomyak.serdha.api.v0
 
 import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
 
-public interface Expression<RuntimeType, DatabaseType : ColumnType<RuntimeType & Any>, OwnerBuilderUserWrapper : Any> {
-	public class Equals<RuntimeType, DatabaseType : ColumnType<RuntimeType & Any>, OwnerBuilderUserWrapper : Any>(
-		public val left: Expression<RuntimeType, DatabaseType, OwnerBuilderUserWrapper>,
-		public val right: Expression<RuntimeType, DatabaseType, OwnerBuilderUserWrapper>,
-	) : Expression<Boolean, ColumnType.BOOLEAN, OwnerBuilderUserWrapper>
+public interface Expression<RuntimeType, DatabaseType : ColumnType<RuntimeType & Any>, OwnerBuilderUserExtension : Any> {
+	public interface Builder<OwnerBuilderUserExtension : Any> {
+		public fun <RuntimeType, DatabaseType : ColumnType<RuntimeType & Any>> equals(
+			left: Expression<RuntimeType, DatabaseType, OwnerBuilderUserExtension>,
+			right: Expression<RuntimeType, DatabaseType, OwnerBuilderUserExtension>
+		): Expression<Boolean, ColumnType.BOOLEAN, OwnerBuilderUserExtension>
+	}
 }
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableCreator.kt
index 4d21c34..7885df2 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableCreator.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableCreator.kt
@@ -4,6 +4,8 @@ import kotlin.jvm.JvmName
 import ru.landgrafhomyak.serdha.api.v0.Expression
 
 public interface TableCreator<TableUserExtension : Any> {
+	public val expressionBuilder: Expression.Builder<TableUserExtension>
+
 	/**
 	 * Offers column of type [D][type] with `NOT NULL` constraint named [name] and runtime type [RuntimeType].
 	 *
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/_CommonQueryMethods.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/_CommonQueryMethods.kt
index 71f42c1..0831770 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/_CommonQueryMethods.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/_CommonQueryMethods.kt
@@ -11,6 +11,8 @@ public interface _CommonQueryMethods<QueryUserExtension : Any> {
 	public fun <SelectedQueryUserExtension : Any> selectQuery(t: Select<SelectedQueryUserExtension>): SelectedTable<SelectedQueryUserExtension, QueryUserExtension>
 	public fun <RuntimeType, DatabaseType : ColumnType<RuntimeType & Any>> param(name: String, type: DatabaseType): InputParam<RuntimeType, DatabaseType, QueryUserExtension>
 
+	public val expressionBuilder: Expression.Builder<QueryUserExtension>
+
 	public interface _Returning<QueryUserExtension : Any> {
 		public fun <RuntimeType, DatabaseType : ColumnType<RuntimeType & Any>> returnExpression(expression: Expression<RuntimeType, DatabaseType, QueryUserExtension>): Column<RuntimeType, DatabaseType, QueryUserExtension>