diff --git a/Postgrest/Interfaces/IPostgrestTable.cs b/Postgrest/Interfaces/IPostgrestTable.cs
index 649d466..ca06d5d 100644
--- a/Postgrest/Interfaces/IPostgrestTable.cs
+++ b/Postgrest/Interfaces/IPostgrestTable.cs
@@ -35,7 +35,7 @@ namespace Supabase.Postgrest.Interfaces
         /// </summary>
         /// <param name="filters"></param>
         /// <returns></returns>
-        Table<TModel> And(List<IPostgrestQueryFilter> filters);
+        IPostgrestTable<TModel> And(List<IPostgrestQueryFilter> filters);
 
         /// <summary>
         /// Clears currently defined query values.
@@ -52,7 +52,7 @@ namespace Supabase.Postgrest.Interfaces
         /// </summary>
         /// <param name="columns"></param>
         /// <returns></returns>
-        Table<TModel> Columns(string[] columns);
+        IPostgrestTable<TModel> Columns(string[] columns);
 
         /// <summary>
         /// By using the columns query parameter it’s possible to specify the payload keys that will be inserted and ignore the rest of the payload.
@@ -64,7 +64,7 @@ namespace Supabase.Postgrest.Interfaces
         /// </summary>
         /// <param name="predicate"></param>
         /// <returns></returns>
-        Table<TModel> Columns(Expression<Func<TModel, object[]>> predicate);
+        IPostgrestTable<TModel> Columns(Expression<Func<TModel, object[]>> predicate);
 
         /// <summary>
         /// Returns ONLY a count from the specified query.
@@ -99,7 +99,7 @@ Task<ModeledResponse<TModel>> Delete(TModel model, QueryOptions? options = null,
         /// <param name="op">Operation to perform.</param>
         /// <param name="criterion">Value to filter with, must be a `string`, `List&lt;object&gt;`, `Dictionary&lt;string, object&gt;`, `FullTextSearchConfig`, or `Range`</param>
         /// <returns></returns>
-        Table<TModel> Filter<TCriterion>(string columnName, Constants.Operator op, TCriterion? criterion);
+        IPostgrestTable<TModel> Filter<TCriterion>(string columnName, Constants.Operator op, TCriterion? criterion);
 
         /// <summary>
         /// Add a filter to a query request using a predicate to select column.
@@ -109,7 +109,7 @@ Task<ModeledResponse<TModel>> Delete(TModel model, QueryOptions? options = null,
         /// <param name="criterion">Value to filter with, must be a `string`, `List&lt;object&gt;`, `Dictionary&lt;string, object&gt;`, `FullTextSearchConfig`, or `Range`</param>
         /// <returns></returns>
         /// <exception cref="ArgumentException"></exception>
-        Table<TModel> Filter<TCriterion>(Expression<Func<TModel, object>> predicate, Constants.Operator op,
+        IPostgrestTable<TModel> Filter<TCriterion>(Expression<Func<TModel, object>> predicate, Constants.Operator op,
             TCriterion? criterion);
 
         /// <summary>
@@ -145,28 +145,28 @@ Task<ModeledResponse<TModel>> Insert(TModel model, QueryOptions? options = null,
         /// <param name="limit"></param>
         /// <param name="foreignTableName"></param>
         /// <returns></returns>
-        Table<TModel> Limit(int limit, string? foreignTableName = null);
+        IPostgrestTable<TModel> Limit(int limit, string? foreignTableName = null);
 
         /// <summary>
         /// Finds all rows whose columns match the specified `query` object.
         /// </summary>
         /// <param name="query">The object to filter with, with column names as keys mapped to their filter values.</param>
         /// <returns></returns>
-        Table<TModel> Match(Dictionary<string, string> query);
+        IPostgrestTable<TModel> Match(Dictionary<string, string> query);
 
         /// <summary>
         /// Fills in query parameters based on a given model's primary key(s).
         /// </summary>
         /// <param name="model">A model with a primary key column</param>
         /// <returns></returns>
-        Table<TModel> Match(TModel model);
+        IPostgrestTable<TModel> Match(TModel model);
 
         /// <summary>
         /// Adds a NOT filter to the current query args.
         /// </summary>
         /// <param name="filter"></param>
         /// <returns></returns>
-        Table<TModel> Not(IPostgrestQueryFilter filter);
+        IPostgrestTable<TModel> Not(IPostgrestQueryFilter filter);
 
         /// <summary>
         /// Adds a NOT filter to the current query args.
@@ -175,7 +175,7 @@ Task<ModeledResponse<TModel>> Insert(TModel model, QueryOptions? options = null,
         /// <param name="op"></param>
         /// <param name="criteria"></param>
         /// <returns></returns>
-        Table<TModel> Not(string columnName, Constants.Operator op, Dictionary<string, object> criteria);
+        IPostgrestTable<TModel> Not(string columnName, Constants.Operator op, Dictionary<string, object> criteria);
 
         /// <summary>
         /// Adds a NOT filter to the current query args.
@@ -184,7 +184,7 @@ Task<ModeledResponse<TModel>> Insert(TModel model, QueryOptions? options = null,
         /// <param name="op"></param>
         /// <param name="criteria"></param>
         /// <returns></returns>
-        Table<TModel> Not(Expression<Func<TModel, object>> predicate, Constants.Operator op, Dictionary<string, object> criteria);
+        IPostgrestTable<TModel> Not(Expression<Func<TModel, object>> predicate, Constants.Operator op, Dictionary<string, object> criteria);
 
         /// <summary>
         /// Adds a NOT filter to the current query args.
@@ -197,7 +197,7 @@ Task<ModeledResponse<TModel>> Insert(TModel model, QueryOptions? options = null,
         /// <param name="op"></param>
         /// <param name="criteria"></param>
         /// <returns></returns>
-        Table<TModel> Not<TCriterion>(string columnName, Constants.Operator op, List<TCriterion> criteria);
+        IPostgrestTable<TModel> Not<TCriterion>(string columnName, Constants.Operator op, List<TCriterion> criteria);
 
         /// <summary>
         /// Adds a NOT filter to the current query args.
@@ -210,7 +210,7 @@ Task<ModeledResponse<TModel>> Insert(TModel model, QueryOptions? options = null,
         /// <param name="op"></param>
         /// <param name="criteria"></param>
         /// <returns></returns>
-        Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Constants.Operator op,
+        IPostgrestTable<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Constants.Operator op,
             List<TCriterion> criteria);
 
         /// <summary>
@@ -225,7 +225,7 @@ Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Consta
         /// <param name="op"></param>
         /// <param name="criterion"></param>
         /// <returns></returns>
-        Table<TModel> Not<TCriterion>(string columnName, Constants.Operator op, TCriterion? criterion);
+        IPostgrestTable<TModel> Not<TCriterion>(string columnName, Constants.Operator op, TCriterion? criterion);
 
 
         /// <summary>
@@ -240,7 +240,7 @@ Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Consta
         /// <param name="op"></param>
         /// <param name="criterion"></param>
         /// <returns></returns>
-        Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Constants.Operator op,
+        IPostgrestTable<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Constants.Operator op,
             TCriterion? criterion);
 
         /// <summary>
@@ -249,28 +249,28 @@ Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Consta
         /// <param name="offset"></param>
         /// <param name="foreignTableName"></param>
         /// <returns></returns>
-        Table<TModel> Offset(int offset, string? foreignTableName = null);
+        IPostgrestTable<TModel> Offset(int offset, string? foreignTableName = null);
 
         /// <summary>
         /// By specifying the onConflict query parameter, you can make UPSERT work on a column(s) that has a UNIQUE constraint.
         /// </summary>
         /// <param name="columnName"></param>
         /// <returns></returns>
-        Table<TModel> OnConflict(string columnName);
+        IPostgrestTable<TModel> OnConflict(string columnName);
 
         /// <summary>
         /// Set an onConflict query parameter for UPSERTing on a column that has a UNIQUE constraint using a linq predicate.
         /// </summary>
         /// <param name="predicate">Expects a column from the model to be returned.</param>
         /// <returns></returns>
-        Table<TModel> OnConflict(Expression<Func<TModel, object>> predicate);
+        IPostgrestTable<TModel> OnConflict(Expression<Func<TModel, object>> predicate);
 
         /// <summary>
         /// Adds a OR Filter to the current query args.
         /// </summary>
         /// <param name="filters"></param>
         /// <returns></returns>
-        Table<TModel> Or(List<IPostgrestQueryFilter> filters);
+        IPostgrestTable<TModel> Or(List<IPostgrestQueryFilter> filters);
 
         /// <summary>
         /// Adds an ordering to the current query args.
@@ -284,7 +284,7 @@ Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Consta
         /// <param name="ordering"></param>
         /// <param name="nullPosition"></param>
         /// <returns></returns>
-        Table<TModel> Order(string column, Constants.Ordering ordering,
+        IPostgrestTable<TModel> Order(string column, Constants.Ordering ordering,
             Constants.NullPosition nullPosition = Constants.NullPosition.First);
 
         /// <summary>
@@ -299,7 +299,7 @@ Table<TModel> Order(string column, Constants.Ordering ordering,
         /// <param name="ordering">>Expects a columns from the Model to be returned</param>
         /// <param name="nullPosition"></param>
         /// <returns></returns>
-        Table<TModel> Order(Expression<Func<TModel, object>> predicate, Constants.Ordering ordering,
+        IPostgrestTable<TModel> Order(Expression<Func<TModel, object>> predicate, Constants.Ordering ordering,
             Constants.NullPosition nullPosition = Constants.NullPosition.First);
 
         /// <summary>
@@ -315,7 +315,7 @@ Table<TModel> Order(Expression<Func<TModel, object>> predicate, Constants.Orderi
         /// <param name="ordering"></param>
         /// <param name="nullPosition"></param>
         /// <returns></returns>
-        Table<TModel> Order(string foreignTable, string column, Constants.Ordering ordering,
+        IPostgrestTable<TModel> Order(string foreignTable, string column, Constants.Ordering ordering,
             Constants.NullPosition nullPosition = Constants.NullPosition.First);
 
         /// <summary>
@@ -323,7 +323,7 @@ Table<TModel> Order(string foreignTable, string column, Constants.Ordering order
         /// </summary>
         /// <param name="from"></param>
         /// <returns></returns>
-        Table<TModel> Range(int from);
+        IPostgrestTable<TModel> Range(int from);
 
         /// <summary>
         /// Sets a bounded range to the current query.
@@ -331,14 +331,14 @@ Table<TModel> Order(string foreignTable, string column, Constants.Ordering order
         /// <param name="from"></param>
         /// <param name="to"></param>
         /// <returns></returns>
-        Table<TModel> Range(int from, int to);
+        IPostgrestTable<TModel> Range(int from, int to);
 
         /// <summary>
         /// Select columns for query. 
         /// </summary>
         /// <param name="columnQuery"></param>
         /// <returns></returns>
-        Table<TModel> Select(string columnQuery);
+        IPostgrestTable<TModel> Select(string columnQuery);
 
         /// <summary>
         /// Select columns using a predicate function.
@@ -348,7 +348,7 @@ Table<TModel> Order(string foreignTable, string column, Constants.Ordering order
         /// </summary>
         /// <param name="predicate">Expects an array of columns from the Model to be returned.</param>
         /// <returns></returns>
-        Table<TModel> Select(Expression<Func<TModel, object[]>> predicate);
+        IPostgrestTable<TModel> Select(Expression<Func<TModel, object[]>> predicate);
 
         /// <summary>
         /// Filter a query based on a predicate function. 
@@ -365,7 +365,7 @@ Table<TModel> Order(string foreignTable, string column, Constants.Ordering order
         /// </summary>
         /// <param name="predicate"></param>
         /// <returns></returns>
-        Table<TModel> Where(Expression<Func<TModel, bool>> predicate);
+        IPostgrestTable<TModel> Where(Expression<Func<TModel, bool>> predicate);
 
         /// <summary>
         /// Executes a query that expects to have a single object returned, rather than returning list of models
@@ -383,7 +383,7 @@ Table<TModel> Order(string foreignTable, string column, Constants.Ordering order
         /// <param name="keySelector"></param>
         /// <param name="value"></param>
         /// <returns></returns>
-        Table<TModel> Set(Expression<Func<TModel, object>> keySelector, object? value);
+        IPostgrestTable<TModel> Set(Expression<Func<TModel, object>> keySelector, object? value);
 
         /// <summary>
         /// Specifies a KeyValuePair to be updated. Should be combined with filters/where clauses.
@@ -393,7 +393,7 @@ Table<TModel> Order(string foreignTable, string column, Constants.Ordering order
         /// <param name="keyValuePairExpression"></param>
         /// <returns></returns>
         /// <exception cref="ArgumentException"></exception>
-        Table<TModel> Set(Expression<Func<TModel, KeyValuePair<object, object?>>> keyValuePairExpression);
+        IPostgrestTable<TModel> Set(Expression<Func<TModel, KeyValuePair<object, object?>>> keyValuePairExpression);
 
         /// <summary>
         /// Calls an Update function after `Set` has been called.
diff --git a/Postgrest/Linq/WhereExpressionVisitor.cs b/Postgrest/Linq/WhereExpressionVisitor.cs
index e342b81..8b6b63c 100644
--- a/Postgrest/Linq/WhereExpressionVisitor.cs
+++ b/Postgrest/Linq/WhereExpressionVisitor.cs
@@ -123,9 +123,9 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
                 case nameof(String.Contains):
 
                     if (typeof(ICollection).IsAssignableFrom(node.Method.DeclaringType))
-                        Filter = new QueryFilter(column, Constants.Operator.Contains, GetArgumentValues(node));
+                        Filter = new QueryFilter(column, Operator.Contains, GetArgumentValues(node));
                     else
-                        Filter = new QueryFilter(column, Constants.Operator.Like, "*" + GetArgumentValues(node).First() + "*");
+                        Filter = new QueryFilter(column, Operator.Like, "*" + GetArgumentValues(node).First() + "*");
 
                     break;
                 default:
@@ -141,7 +141,7 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
         /// <param name="column"></param>
         /// <param name="op"></param>
         /// <param name="constantExpression"></param>
-        private void HandleConstantExpression(string column, Constants.Operator op, ConstantExpression constantExpression)
+        private void HandleConstantExpression(string column, Operator op, ConstantExpression constantExpression)
         {
             if (constantExpression.Type.IsEnum)
             {
@@ -160,7 +160,7 @@ private void HandleConstantExpression(string column, Constants.Operator op, Cons
         /// <param name="column"></param>
         /// <param name="op"></param>
         /// <param name="memberExpression"></param>
-        private void HandleMemberExpression(string column, Constants.Operator op, MemberExpression memberExpression)
+        private void HandleMemberExpression(string column, Operator op, MemberExpression memberExpression)
         {
             Filter = new QueryFilter(column, op, GetMemberExpressionValue(memberExpression));
         }
@@ -171,7 +171,7 @@ private void HandleMemberExpression(string column, Constants.Operator op, Member
         /// <param name="column"></param>
         /// <param name="op"></param>
         /// <param name="unaryExpression"></param>
-        private void HandleUnaryExpression(string column, Constants.Operator op, UnaryExpression unaryExpression)
+        private void HandleUnaryExpression(string column, Operator op, UnaryExpression unaryExpression)
         {
             if (unaryExpression.Operand is ConstantExpression constantExpression)
             {
@@ -193,7 +193,7 @@ private void HandleUnaryExpression(string column, Constants.Operator op, UnaryEx
         /// <param name="column"></param>
         /// <param name="op"></param>
         /// <param name="newExpression"></param>
-        private void HandleNewExpression(string column, Constants.Operator op, NewExpression newExpression)
+        private void HandleNewExpression(string column, Operator op, NewExpression newExpression)
         {
             var argumentValues = new List<object>();
             foreach (var argument in newExpression.Arguments)
@@ -279,22 +279,22 @@ private object GetMemberExpressionValue(MemberExpression member)
         /// </summary>
         /// <param name="node"></param>
         /// <returns></returns>
-        private Constants.Operator GetMappedOperator(Expression node)
+        private Operator GetMappedOperator(Expression node)
         {
             return node.NodeType switch
             {
-                ExpressionType.Not => Constants.Operator.Not,
-                ExpressionType.And => Constants.Operator.And,
-                ExpressionType.AndAlso => Constants.Operator.And,
-                ExpressionType.OrElse => Constants.Operator.Or,
-                ExpressionType.Or => Constants.Operator.Or,
-                ExpressionType.Equal => Constants.Operator.Equals,
-                ExpressionType.NotEqual => Constants.Operator.NotEqual,
-                ExpressionType.LessThan => Constants.Operator.LessThan,
-                ExpressionType.GreaterThan => Constants.Operator.GreaterThan,
-                ExpressionType.LessThanOrEqual => Constants.Operator.LessThanOrEqual,
-                ExpressionType.GreaterThanOrEqual => Constants.Operator.GreaterThanOrEqual,
-                _ => Constants.Operator.Equals
+                ExpressionType.Not => Operator.Not,
+                ExpressionType.And => Operator.And,
+                ExpressionType.AndAlso => Operator.And,
+                ExpressionType.OrElse => Operator.Or,
+                ExpressionType.Or => Operator.Or,
+                ExpressionType.Equal => Operator.Equals,
+                ExpressionType.NotEqual => Operator.NotEqual,
+                ExpressionType.LessThan => Operator.LessThan,
+                ExpressionType.GreaterThan => Operator.GreaterThan,
+                ExpressionType.LessThanOrEqual => Operator.LessThanOrEqual,
+                ExpressionType.GreaterThanOrEqual => Operator.GreaterThanOrEqual,
+                _ => Operator.Equals
             };
         }
 
diff --git a/Postgrest/QueryFilter.cs b/Postgrest/QueryFilter.cs
index d8c050e..6f21c55 100644
--- a/Postgrest/QueryFilter.cs
+++ b/Postgrest/QueryFilter.cs
@@ -23,7 +23,7 @@ public class QueryFilter<TModel, TCriterion> : IPostgrestQueryFilter
         public object? Criteria { get; }
 
         /// <inheritdoc />
-        public Constants.Operator Op { get; }
+        public Operator Op { get; }
 
         /// <inheritdoc />
         public string? Property { get; }
@@ -35,7 +35,7 @@ public class QueryFilter<TModel, TCriterion> : IPostgrestQueryFilter
         /// <param name="op"></param>
         /// <param name="criterion"></param>
         /// <exception cref="ArgumentException"></exception>
-        public QueryFilter(Expression<Func<TModel, object>> predicate, Constants.Operator op, TCriterion? criterion)
+        public QueryFilter(Expression<Func<TModel, object>> predicate, Operator op, TCriterion? criterion)
         {
             var visitor = new SelectExpressionVisitor();
             visitor.Visit(predicate);
@@ -66,7 +66,7 @@ public class QueryFilter : IPostgrestQueryFilter
         public string? Property { get; private set; }
 
         /// <inheritdoc />
-        public Constants.Operator Op { get; private set; }
+        public Operator Op { get; private set; }
 
         /// <inheritdoc />
         public object? Criteria { get; private set; }
@@ -77,7 +77,7 @@ public class QueryFilter : IPostgrestQueryFilter
         /// <param name="property">Column name</param>
         /// <param name="op">Operation: And, Equals, GreaterThan, LessThan, GreaterThanOrEqual, LessThanOrEqual, NotEqual, Is, Adjacent, Not, Like, ILike</param>
         /// <param name="criteria"></param>
-        public QueryFilter(string property, Constants.Operator op, object? criteria)
+        public QueryFilter(string property, Operator op, object? criteria)
         {
             if (criteria is DateTime dateTime)
                 criteria = dateTime.ToString("o", CultureInfo.InvariantCulture);
@@ -86,26 +86,26 @@ public QueryFilter(string property, Constants.Operator op, object? criteria)
             
             switch (op)
             {
-                case Constants.Operator.And:
-                case Constants.Operator.Equals:
-                case Constants.Operator.GreaterThan:
-                case Constants.Operator.GreaterThanOrEqual:
-                case Constants.Operator.LessThan:
-                case Constants.Operator.LessThanOrEqual:
-                case Constants.Operator.NotEqual:
-                case Constants.Operator.Is:
-                case Constants.Operator.Adjacent:
-                case Constants.Operator.Not:
-                case Constants.Operator.Like:
-                case Constants.Operator.ILike:
+                case Operator.And:
+                case Operator.Equals:
+                case Operator.GreaterThan:
+                case Operator.GreaterThanOrEqual:
+                case Operator.LessThan:
+                case Operator.LessThanOrEqual:
+                case Operator.NotEqual:
+                case Operator.Is:
+                case Operator.Adjacent:
+                case Operator.Not:
+                case Operator.Like:
+                case Operator.ILike:
                     Property = property;
                     Op = op;
                     Criteria = criteria;
                     break;
-                case Constants.Operator.In:
-                case Constants.Operator.Contains:
-                case Constants.Operator.ContainedIn:
-                case Constants.Operator.Overlap:
+                case Operator.In:
+                case Operator.Contains:
+                case Operator.ContainedIn:
+                case Operator.Overlap:
                     if (criteria is IList or IDictionary)
                     {
                         Property = property;
@@ -131,14 +131,14 @@ public QueryFilter(string property, Constants.Operator op, object? criteria)
         /// <param name="property">Column Name</param>
         /// <param name="op">Operation: FTS, PHFTS, PLFTS, WFTS</param>
         /// <param name="fullTextSearchConfig"></param>
-        public QueryFilter(string property, Constants.Operator op, FullTextSearchConfig fullTextSearchConfig)
+        public QueryFilter(string property, Operator op, FullTextSearchConfig fullTextSearchConfig)
         {
             switch (op)
             {
-                case Constants.Operator.FTS:
-                case Constants.Operator.PHFTS:
-                case Constants.Operator.PLFTS:
-                case Constants.Operator.WFTS:
+                case Operator.FTS:
+                case Operator.PHFTS:
+                case Operator.PLFTS:
+                case Operator.WFTS:
                     Property = property;
                     Op = op;
                     Criteria = fullTextSearchConfig;
@@ -155,18 +155,18 @@ public QueryFilter(string property, Constants.Operator op, FullTextSearchConfig
         /// <param name="property"></param>
         /// <param name="op">Operator: Overlap, StrictlyLeft, StrictlyRight, NotRightOf, NotLeftOf, Adjacent</param>
         /// <param name="range"></param>
-        public QueryFilter(string property, Constants.Operator op, IntRange range)
+        public QueryFilter(string property, Operator op, IntRange range)
         {
             switch (op)
             {
-                case Constants.Operator.Overlap:
-                case Constants.Operator.Contains:
-                case Constants.Operator.ContainedIn:
-                case Constants.Operator.StrictlyLeft:
-                case Constants.Operator.StrictlyRight:
-                case Constants.Operator.NotRightOf:
-                case Constants.Operator.NotLeftOf:
-                case Constants.Operator.Adjacent:
+                case Operator.Overlap:
+                case Operator.Contains:
+                case Operator.ContainedIn:
+                case Operator.StrictlyLeft:
+                case Operator.StrictlyRight:
+                case Operator.NotRightOf:
+                case Operator.NotLeftOf:
+                case Operator.Adjacent:
                     Property = property;
                     Op = op;
                     Criteria = range;
@@ -184,12 +184,12 @@ public QueryFilter(string property, Constants.Operator op, IntRange range)
         /// </summary>
         /// <param name="op">Operation: And, Or</param>
         /// <param name="filters"></param>
-        public QueryFilter(Constants.Operator op, List<IPostgrestQueryFilter> filters)
+        public QueryFilter(Operator op, List<IPostgrestQueryFilter> filters)
         {
             switch (op)
             {
-                case Constants.Operator.Or:
-                case Constants.Operator.And:
+                case Operator.Or:
+                case Operator.And:
                     Op = op;
                     Criteria = filters;
                     break;
@@ -204,11 +204,11 @@ public QueryFilter(Constants.Operator op, List<IPostgrestQueryFilter> filters)
         /// </summary>
         /// <param name="op">Operation: Not.</param>
         /// <param name="filter"></param>
-        public QueryFilter(Constants.Operator op, IPostgrestQueryFilter filter)
+        public QueryFilter(Operator op, IPostgrestQueryFilter filter)
         {
             switch (op)
             {
-                case Constants.Operator.Not:
+                case Operator.Not:
                     Op = op;
                     Criteria = filter;
                     break;
diff --git a/Postgrest/QueryOrderer.cs b/Postgrest/QueryOrderer.cs
index b799e04..2c38152 100644
--- a/Postgrest/QueryOrderer.cs
+++ b/Postgrest/QueryOrderer.cs
@@ -8,10 +8,10 @@ public class QueryOrderer
 	{
 		public string? ForeignTable { get; }
 		public string Column { get; }
-		public Constants.Ordering Ordering { get; }
-		public Constants.NullPosition NullPosition { get; }
+		public Ordering Ordering { get; }
+		public NullPosition NullPosition { get; }
 
-		public QueryOrderer(string? foreignTable, string column, Constants.Ordering ordering, Constants.NullPosition nullPosition)
+		public QueryOrderer(string? foreignTable, string column, Ordering ordering, NullPosition nullPosition)
 		{
 			ForeignTable = foreignTable;
 			Column = column;
diff --git a/Postgrest/Table.cs b/Postgrest/Table.cs
index 5b21f10..ef23779 100644
--- a/Postgrest/Table.cs
+++ b/Postgrest/Table.cs
@@ -99,7 +99,7 @@ public Table(string baseUrl, JsonSerializerSettings serializerSettings, ClientOp
         }
 
         /// <inheritdoc />
-        public Table<TModel> Filter<TCriterion>(Expression<Func<TModel, object>> predicate, Constants.Operator op,
+        public IPostgrestTable<TModel> Filter<TCriterion>(Expression<Func<TModel, object>> predicate, Operator op,
             TCriterion? criterion)
         {
             var visitor = new SelectExpressionVisitor();
@@ -115,21 +115,21 @@ public Table<TModel> Filter<TCriterion>(Expression<Func<TModel, object>> predica
         }
 
         /// <inheritdoc />
-        public Table<TModel> Filter<TCriterion>(string columnName, Constants.Operator op, TCriterion? criterion)
+        public IPostgrestTable<TModel> Filter<TCriterion>(string columnName, Operator op, TCriterion? criterion)
         {
             switch (criterion)
             {
                 case null:
                     switch (op)
                     {
-                        case Constants.Operator.Equals:
-                        case Constants.Operator.Is:
-                            _filters.Add(new QueryFilter(columnName, Constants.Operator.Is, QueryFilter.NullVal));
+                        case Operator.Equals:
+                        case Operator.Is:
+                            _filters.Add(new QueryFilter(columnName, Operator.Is, QueryFilter.NullVal));
                             break;
-                        case Constants.Operator.Not:
-                        case Constants.Operator.NotEqual:
-                            _filters.Add(new QueryFilter(columnName, Constants.Operator.Not,
-                                new QueryFilter(columnName, Constants.Operator.Is, QueryFilter.NullVal)));
+                        case Operator.Not:
+                        case Operator.NotEqual:
+                            _filters.Add(new QueryFilter(columnName, Operator.Not,
+                                new QueryFilter(columnName, Operator.Is, QueryFilter.NullVal)));
                             break;
                         default:
                             throw new PostgrestException(
@@ -169,18 +169,18 @@ public Table<TModel> Filter<TCriterion>(string columnName, Constants.Operator op
         }
 
         /// <inheritdoc />
-        public Table<TModel> Not(IPostgrestQueryFilter filter)
+        public IPostgrestTable<TModel> Not(IPostgrestQueryFilter filter)
         {
-            _filters.Add(new QueryFilter(Constants.Operator.Not, filter));
+            _filters.Add(new QueryFilter(Operator.Not, filter));
             return this;
         }
 
         /// <inheritdoc />
-        public Table<TModel> Not<TCriterion>(string columnName, Constants.Operator op, TCriterion? criterion) =>
+        public IPostgrestTable<TModel> Not<TCriterion>(string columnName, Operator op, TCriterion? criterion) =>
             Not(new QueryFilter(columnName, op, criterion));
 
         /// <inheritdoc />
-        public Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Constants.Operator op,
+        public IPostgrestTable<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Operator op,
             TCriterion? criterion)
         {
             var visitor = new SelectExpressionVisitor();
@@ -196,11 +196,11 @@ public Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate,
         }
 
         /// <inheritdoc />
-        public Table<TModel> Not<TCriterion>(string columnName, Constants.Operator op, List<TCriterion> criteria) =>
+        public IPostgrestTable<TModel> Not<TCriterion>(string columnName, Operator op, List<TCriterion> criteria) =>
             Not(new QueryFilter(columnName, op, criteria.Cast<object>().ToList()));
 
         /// <inheritdoc />
-        public Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Constants.Operator op,
+        public IPostgrestTable<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate, Operator op,
             List<TCriterion> criteria)
         {
             var visitor = new SelectExpressionVisitor();
@@ -216,11 +216,11 @@ public Table<TModel> Not<TCriterion>(Expression<Func<TModel, object>> predicate,
         }
 
         /// <inheritdoc />
-        public Table<TModel> Not(string columnName, Constants.Operator op, Dictionary<string, object> criteria) =>
+        public IPostgrestTable<TModel> Not(string columnName, Operator op, Dictionary<string, object> criteria) =>
             Not(new QueryFilter(columnName, op, criteria));
 
         /// <inheritdoc />
-        public Table<TModel> Not(Expression<Func<TModel, object>> predicate, Constants.Operator op,
+        public IPostgrestTable<TModel> Not(Expression<Func<TModel, object>> predicate, Operator op,
             Dictionary<string, object> criteria)
         {
             var visitor = new SelectExpressionVisitor();
@@ -237,44 +237,44 @@ public Table<TModel> Not(Expression<Func<TModel, object>> predicate, Constants.O
 
 
         /// <inheritdoc />
-        public Table<TModel> And(List<IPostgrestQueryFilter> filters)
+        public IPostgrestTable<TModel> And(List<IPostgrestQueryFilter> filters)
         {
-            _filters.Add(new QueryFilter(Constants.Operator.And, filters));
+            _filters.Add(new QueryFilter(Operator.And, filters));
             return this;
         }
 
         /// <inheritdoc />
-        public Table<TModel> Or(List<IPostgrestQueryFilter> filters)
+        public IPostgrestTable<TModel> Or(List<IPostgrestQueryFilter> filters)
         {
-            _filters.Add(new QueryFilter(Constants.Operator.Or, filters));
+            _filters.Add(new QueryFilter(Operator.Or, filters));
             return this;
         }
 
         /// <inheritdoc />
-        public Table<TModel> Match(TModel model)
+        public IPostgrestTable<TModel> Match(TModel model)
         {
             foreach (var kvp in model.PrimaryKey)
             {
-                _filters.Add(new QueryFilter(kvp.Key.ColumnName, Constants.Operator.Equals, kvp.Value));
+                _filters.Add(new QueryFilter(kvp.Key.ColumnName, Operator.Equals, kvp.Value));
             }
 
             return this;
         }
 
         /// <inheritdoc />
-        public Table<TModel> Match(Dictionary<string, string> query)
+        public IPostgrestTable<TModel> Match(Dictionary<string, string> query)
         {
             foreach (var param in query)
             {
-                _filters.Add(new QueryFilter(param.Key, Constants.Operator.Equals, param.Value));
+                _filters.Add(new QueryFilter(param.Key, Operator.Equals, param.Value));
             }
 
             return this;
         }
 
         /// <inheritdoc />
-        public Table<TModel> Order(Expression<Func<TModel, object>> predicate, Constants.Ordering ordering,
-            Constants.NullPosition nullPosition = Constants.NullPosition.First)
+        public IPostgrestTable<TModel> Order(Expression<Func<TModel, object>> predicate, Ordering ordering,
+            NullPosition nullPosition = NullPosition.First)
         {
             var visitor = new SelectExpressionVisitor();
             visitor.Visit(predicate);
@@ -290,29 +290,29 @@ public Table<TModel> Order(Expression<Func<TModel, object>> predicate, Constants
 
 
         /// <inheritdoc />
-        public Table<TModel> Order(string column, Constants.Ordering ordering, Constants.NullPosition nullPosition = Constants.NullPosition.First)
+        public IPostgrestTable<TModel> Order(string column, Ordering ordering, NullPosition nullPosition = NullPosition.First)
         {
             _orderers.Add(new QueryOrderer(null, column, ordering, nullPosition));
             return this;
         }
 
         /// <inheritdoc />
-        public Table<TModel> Order(string foreignTable, string column, Constants.Ordering ordering,
-            Constants.NullPosition nullPosition = Constants.NullPosition.First)
+        public IPostgrestTable<TModel> Order(string foreignTable, string column, Ordering ordering,
+            NullPosition nullPosition = NullPosition.First)
         {
             _orderers.Add(new QueryOrderer(foreignTable, column, ordering, nullPosition));
             return this;
         }
 
         /// <inheritdoc />
-        public Table<TModel> Range(int from)
+        public IPostgrestTable<TModel> Range(int from)
         {
             _rangeFrom = from;
             return this;
         }
 
         /// <inheritdoc />
-        public Table<TModel> Range(int from, int to)
+        public IPostgrestTable<TModel> Range(int from, int to)
         {
             _rangeFrom = from;
             _rangeTo = to;
@@ -320,7 +320,7 @@ public Table<TModel> Range(int from, int to)
         }
 
         /// <inheritdoc />
-        public Table<TModel> Select(string columnQuery)
+        public IPostgrestTable<TModel> Select(string columnQuery)
         {
             _method = HttpMethod.Get;
             _columnQuery = columnQuery;
@@ -328,7 +328,7 @@ public Table<TModel> Select(string columnQuery)
         }
 
         /// <inheritdoc />
-        public Table<TModel> Select(Expression<Func<TModel, object[]>> predicate)
+        public IPostgrestTable<TModel> Select(Expression<Func<TModel, object[]>> predicate)
         {
             var visitor = new SelectExpressionVisitor();
             visitor.Visit(predicate);
@@ -341,7 +341,7 @@ public Table<TModel> Select(Expression<Func<TModel, object[]>> predicate)
         }
 
         /// <inheritdoc />
-        public Table<TModel> Where(Expression<Func<TModel, bool>> predicate)
+        public IPostgrestTable<TModel> Where(Expression<Func<TModel, bool>> predicate)
         {
             var visitor = new WhereExpressionVisitor();
             visitor.Visit(predicate);
@@ -350,11 +350,11 @@ public Table<TModel> Where(Expression<Func<TModel, bool>> predicate)
                 throw new ArgumentException(
                     "Unable to parse the supplied predicate, did you return a predicate where each left hand of the condition is a Model property?");
 
-            if (visitor.Filter.Op == Constants.Operator.Equals && visitor.Filter.Criteria == null)
-                _filters.Add(new QueryFilter(visitor.Filter.Property!, Constants.Operator.Is, QueryFilter.NullVal));
-            else if (visitor.Filter.Op == Constants.Operator.NotEqual && visitor.Filter.Criteria == null)
-                _filters.Add(new QueryFilter(visitor.Filter.Property!, Constants.Operator.Not,
-                    new QueryFilter(visitor.Filter.Property!, Constants.Operator.Is, QueryFilter.NullVal)));
+            if (visitor.Filter.Op == Operator.Equals && visitor.Filter.Criteria == null)
+                _filters.Add(new QueryFilter(visitor.Filter.Property!, Operator.Is, QueryFilter.NullVal));
+            else if (visitor.Filter.Op == Operator.NotEqual && visitor.Filter.Criteria == null)
+                _filters.Add(new QueryFilter(visitor.Filter.Property!, Operator.Not,
+                    new QueryFilter(visitor.Filter.Property!, Operator.Is, QueryFilter.NullVal)));
             else
                 _filters.Add(visitor.Filter);
 
@@ -363,7 +363,7 @@ public Table<TModel> Where(Expression<Func<TModel, bool>> predicate)
 
 
         /// <inheritdoc />
-        public Table<TModel> Limit(int limit, string? foreignTableName = null)
+        public IPostgrestTable<TModel> Limit(int limit, string? foreignTableName = null)
         {
             _limit = limit;
             _limitForeignKey = foreignTableName;
@@ -372,14 +372,14 @@ public Table<TModel> Limit(int limit, string? foreignTableName = null)
 
 
         /// <inheritdoc />
-        public Table<TModel> OnConflict(string columnName)
+        public IPostgrestTable<TModel> OnConflict(string columnName)
         {
             _onConflict = columnName;
             return this;
         }
 
         /// <inheritdoc />
-        public Table<TModel> OnConflict(Expression<Func<TModel, object>> predicate)
+        public IPostgrestTable<TModel> OnConflict(Expression<Func<TModel, object>> predicate)
         {
             var visitor = new SelectExpressionVisitor();
             visitor.Visit(predicate);
@@ -397,7 +397,7 @@ public Table<TModel> OnConflict(Expression<Func<TModel, object>> predicate)
 
 
         /// <inheritdoc />
-        public Table<TModel> Columns(string[] columns)
+        public IPostgrestTable<TModel> Columns(string[] columns)
         {
             foreach (var column in columns)
                 _columns.Add(column);
@@ -407,7 +407,7 @@ public Table<TModel> Columns(string[] columns)
 
 
         /// <inheritdoc />
-        public Table<TModel> Columns(Expression<Func<TModel, object[]>> predicate)
+        public IPostgrestTable<TModel> Columns(Expression<Func<TModel, object[]>> predicate)
         {
             var visitor = new SelectExpressionVisitor();
             visitor.Visit(predicate);
@@ -420,7 +420,7 @@ public Table<TModel> Columns(Expression<Func<TModel, object[]>> predicate)
 
 
         /// <inheritdoc />
-        public Table<TModel> Offset(int offset, string? foreignTableName = null)
+        public IPostgrestTable<TModel> Offset(int offset, string? foreignTableName = null)
         {
             _offset = offset;
             _offsetForeignKey = foreignTableName;
@@ -465,7 +465,7 @@ public Task<ModeledResponse<TModel>> Upsert(ICollection<TModel> model, QueryOpti
 
 
         /// <inheritdoc />
-        public Table<TModel> Set(Expression<Func<TModel, object>> keySelector, object? value)
+        public IPostgrestTable<TModel> Set(Expression<Func<TModel, object>> keySelector, object? value)
         {
             var visitor = new SetExpressionVisitor();
             visitor.Visit(keySelector);
@@ -493,7 +493,7 @@ public Table<TModel> Set(Expression<Func<TModel, object>> keySelector, object? v
 
 
         /// <inheritdoc />
-        public Table<TModel> Set(Expression<Func<TModel, KeyValuePair<object, object?>>> keyValuePairExpression)
+        public IPostgrestTable<TModel> Set(Expression<Func<TModel, KeyValuePair<object, object?>>> keyValuePairExpression)
         {
             var visitor = new SetExpressionVisitor();
             visitor.Visit(keyValuePairExpression);
@@ -577,7 +577,7 @@ public Task<ModeledResponse<TModel>> Delete(TModel model, QueryOptions? options
 
 
         /// <inheritdoc />
-        public async Task<int> Count(Constants.CountType type, CancellationToken cancellationToken = default)
+        public async Task<int> Count(CountType type, CancellationToken cancellationToken = default)
         {
             _method = HttpMethod.Head;
 
@@ -777,8 +777,8 @@ internal KeyValuePair<string, string> PrepareFilter(IPostgrestQueryFilter filter
 
             switch (filter.Op)
             {
-                case Constants.Operator.Or:
-                case Constants.Operator.And:
+                case Operator.Or:
+                case Operator.And:
                     if (filter.Criteria is List<IPostgrestQueryFilter> subFilters)
                     {
                         var list = new List<KeyValuePair<string, string>>();
@@ -793,7 +793,7 @@ internal KeyValuePair<string, string> PrepareFilter(IPostgrestQueryFilter filter
                     }
 
                     break;
-                case Constants.Operator.Not:
+                case Operator.Not:
                     if (filter.Criteria is QueryFilter notFilter)
                     {
                         var prepped = PrepareFilter(notFilter);
@@ -801,16 +801,16 @@ internal KeyValuePair<string, string> PrepareFilter(IPostgrestQueryFilter filter
                     }
 
                     break;
-                case Constants.Operator.Like:
-                case Constants.Operator.ILike:
-                    if (filter.Criteria is string likeCriteria && filter.Property != null)
+                case Operator.Like:
+                case Operator.ILike:
+                    if (filter is { Criteria: string likeCriteria, Property: not null })
                     {
                         return new KeyValuePair<string, string>(filter.Property,
                             $"{asAttribute.Mapping}.{likeCriteria.Replace("%", "*")}");
                     }
 
                     break;
-                case Constants.Operator.In:
+                case Operator.In:
                     if (filter is { Criteria: IList inCriteria, Property: not null })
                     {
                         foreach (var item in inCriteria)
@@ -827,9 +827,9 @@ internal KeyValuePair<string, string> PrepareFilter(IPostgrestQueryFilter filter
                     }
 
                     break;
-                case Constants.Operator.Contains:
-                case Constants.Operator.ContainedIn:
-                case Constants.Operator.Overlap:
+                case Operator.Contains:
+                case Operator.ContainedIn:
+                case Operator.Overlap:
                     switch (filter.Criteria)
                     {
                         case IList listCriteria when filter.Property != null:
@@ -849,11 +849,11 @@ internal KeyValuePair<string, string> PrepareFilter(IPostgrestQueryFilter filter
                     }
 
                     break;
-                case Constants.Operator.StrictlyLeft:
-                case Constants.Operator.StrictlyRight:
-                case Constants.Operator.NotRightOf:
-                case Constants.Operator.NotLeftOf:
-                case Constants.Operator.Adjacent:
+                case Operator.StrictlyLeft:
+                case Operator.StrictlyRight:
+                case Operator.NotRightOf:
+                case Operator.NotLeftOf:
+                case Operator.Adjacent:
                     if (filter is { Criteria: IntRange rangeCriterion, Property: not null })
                     {
                         return new KeyValuePair<string, string>(filter.Property,
@@ -861,10 +861,10 @@ internal KeyValuePair<string, string> PrepareFilter(IPostgrestQueryFilter filter
                     }
 
                     break;
-                case Constants.Operator.FTS:
-                case Constants.Operator.PHFTS:
-                case Constants.Operator.PLFTS:
-                case Constants.Operator.WFTS:
+                case Operator.FTS:
+                case Operator.PHFTS:
+                case Operator.PLFTS:
+                case Operator.WFTS:
                     if (filter is { Criteria: FullTextSearchConfig searchConfig, Property: not null })
                     {
                         return new KeyValuePair<string, string>(filter.Property,