diff --git a/build/api/binding.api.md b/build/api/binding.api.md
index d11a82430c..f5655b1c4d 100644
--- a/build/api/binding.api.md
+++ b/build/api/binding.api.md
@@ -4,17 +4,20 @@
 
 ```ts
 
+import { ContentQueryBuilder } from '@contember/client';
 import type { CrudQueryBuilder } from '@contember/client';
 import { EmbeddedActionsParser } from 'chevrotain';
 import { v4 as generateUuid } from 'uuid';
 import { GraphQlBuilder } from '@contember/client';
-import type { GraphQlClient } from '@contember/client';
-import type { GraphQlClientFailedRequestMetadata } from '@contember/client';
+import { GraphQlClient } from '@contember/client';
+import { GraphQlClientError } from '@contember/client';
 import type { GraphQlClientRequestOptions } from '@contember/client';
 import { GraphQlLiteral } from '@contember/client';
 import { Input } from '@contember/client';
+import { MutationResult } from '@contember/client';
 import type { Result } from '@contember/client';
 import { TokenType } from 'chevrotain';
+import { TransactionResult } from '@contember/client';
 import type { TreeFilter } from '@contember/client';
 
 // @public (undocumented)
@@ -112,9 +115,12 @@ export class Config {
     setValue<Name extends keyof BindingConfig>(name: Name, value: BindingConfig[Name]): this;
 }
 
+// @public (undocumented)
+export const createQueryBuilder: (schema: Schema) => ContentQueryBuilder;
+
 // @public (undocumented)
 export class DataBinding<Node> {
-    constructor(contentApiClient: GraphQlClient, systemApiClient: GraphQlClient, tenantApiClient: GraphQlClient, treeStore: TreeStore, environment: Environment, createMarkerTree: (node: Node, environment: Environment) => MarkerTreeRoot, batchedUpdates: (callback: () => any) => void, onUpdate: (newData: TreeRootAccessor<Node>, binding: DataBinding<Node>) => void, onError: (error: RequestError, binding: DataBinding<Node>) => void, onPersistSuccess: (result: SuccessfulPersistResult, binding: DataBinding<Node>) => void, options: {
+    constructor(contentApiClient: GraphQlClient, systemApiClient: GraphQlClient, tenantApiClient: GraphQlClient, treeStore: TreeStore, environment: Environment, createMarkerTree: (node: Node, environment: Environment) => MarkerTreeRoot, batchedUpdates: (callback: () => any) => void, onUpdate: (newData: TreeRootAccessor<Node>, binding: DataBinding<Node>) => void, onError: (error: GraphQlClientError, binding: DataBinding<Node>) => void, onPersistSuccess: (result: SuccessfulPersistResult, binding: DataBinding<Node>) => void, options: {
         skipStateUpdateAfterPersist: boolean;
     });
     // (undocumented)
@@ -124,6 +130,9 @@ export class DataBinding<Node> {
 // @public (undocumented)
 export const DataBindingExtendAborted: unique symbol;
 
+// @public (undocumented)
+export type DataBindingTransactionResult = TransactionResult<Record<string, MutationResult<ReceivedEntityData>>>;
+
 // @public (undocumented)
 export class DirtinessTracker {
     // (undocumented)
@@ -706,10 +715,7 @@ export namespace ErrorAccessor {
 }
 
 // @public (undocumented)
-export type ErrorPathNodeType = FieldPathErrorFragment | IndexPathErrorFragment;
-
-// @public (undocumented)
-export type ErrorPersistResult = InvalidInputPersistResult | RequestError | InvalidResponseResult;
+export type ErrorPersistResult = InvalidInputPersistResult | InvalidResponseResult;
 
 // Warning: (ae-forgotten-export) The symbol "GenericEventsMap" needs to be exported by the entry point index.d.ts
 //
@@ -788,16 +794,6 @@ export class EventManager {
     triggerOnPersistSuccess(options: PersistSuccessOptions): Promise<void>;
 }
 
-// @public (undocumented)
-export interface ExecutionError {
-    // (undocumented)
-    message: string | null;
-    // (undocumented)
-    path: MutationErrorPath;
-    // (undocumented)
-    type: Result.ExecutionErrorType;
-}
-
 // @public (undocumented)
 export type ExpectedEntityCount = 'upToOne' | 'possiblyMany';
 
@@ -931,14 +927,6 @@ export class FieldMarker {
 // @public (undocumented)
 export type FieldName = string;
 
-// @public (undocumented)
-export interface FieldPathErrorFragment {
-    // (undocumented)
-    __typename: '_FieldPathFragment';
-    // (undocumented)
-    field: string;
-}
-
 // @public (undocumented)
 export type FieldValue = JsonValue;
 
@@ -956,19 +944,6 @@ export type GetEntityListSubTree = (parametersOrAlias: Alias | SugaredQualifiedE
 // @public (undocumented)
 export type GetEntitySubTree = (parametersOrAlias: Alias | SugaredQualifiedSingleEntity | SugaredUnconstrainedQualifiedSingleEntity, treeId?: TreeRootId, environment?: Environment) => EntityAccessor;
 
-// @public (undocumented)
-export interface GqlError {
-    // (undocumented)
-    errors: {
-        message: string;
-        path?: string[];
-    }[];
-    // (undocumented)
-    query: string;
-    // (undocumented)
-    type: 'gqlError';
-}
-
 // @public (undocumented)
 export interface HasManyRelation extends Relation, EntityListParameters, EntityListEventListeners {
 }
@@ -1009,16 +984,6 @@ export class HasOneRelationMarker {
     readonly placeholderName: string;
 }
 
-// @public (undocumented)
-export interface IndexPathErrorFragment {
-    // (undocumented)
-    __typename: '_IndexPathFragment';
-    // (undocumented)
-    alias: string | null;
-    // (undocumented)
-    index: number;
-}
-
 // @public (undocumented)
 export interface InvalidInputPersistResult {
     // (undocumented)
@@ -1154,64 +1119,6 @@ export class MarkerTreeRoot {
 // @public (undocumented)
 export type MeaningfulMarker = FieldMarker | HasOneRelationMarker | HasManyRelationMarker | EntityListSubTreeMarker | EntitySubTreeMarker;
 
-// @public (undocumented)
-export const metadataToRequestError: (metadata: GraphQlClientFailedRequestMetadata) => RequestError;
-
-// @public (undocumented)
-export interface MutationDataResponse {
-    // (undocumented)
-    [alias: string]: MutationResponse;
-}
-
-// @public (undocumented)
-export type MutationErrorPath = ErrorPathNodeType[];
-
-// @public (undocumented)
-export interface MutationRequestResponse {
-    // (undocumented)
-    data: MutationTransactionResponse | null;
-    // (undocumented)
-    errors?: {
-        message: string;
-        path?: string[];
-    }[];
-}
-
-// @public (undocumented)
-export interface MutationResponse {
-    // (undocumented)
-    errorMessage: string | null;
-    // (undocumented)
-    errors: ExecutionError[];
-    // (undocumented)
-    node: ReceivedEntityData;
-    // (undocumented)
-    ok: boolean;
-    // (undocumented)
-    validation: {
-        valid: boolean;
-        errors: ValidationError[];
-    } | undefined;
-}
-
-// @public (undocumented)
-export interface MutationTransactionResponse {
-    // (undocumented)
-    transaction: (MutationDataResponse & {
-        __typename: 'MutationTransaction';
-        ok: boolean;
-        errorMessage: string | null;
-    });
-}
-
-// @public (undocumented)
-export interface NetworkErrorRequestError {
-    // (undocumented)
-    metadata: GraphQlClientFailedRequestMetadata;
-    // (undocumented)
-    type: 'networkError';
-}
-
 // @public (undocumented)
 export const NIL_UUID = "00000000-0000-0000-0000-000000000000";
 
@@ -1538,9 +1445,6 @@ export type RelativeSingleField = AnyField & LeafField & {
 // @public (undocumented)
 export type RemovalType = 'disconnect' | 'delete';
 
-// @public (undocumented)
-export type RequestError = UnauthorizedRequestError | NetworkErrorRequestError | GqlError | UnknownErrorRequestError;
-
 // @public (undocumented)
 export type RuntimeId = ServerId | ClientGeneratedUuid | UnpersistedEntityDummyId;
 
@@ -2055,12 +1959,6 @@ export class TreeStore {
 // @public (undocumented)
 export const TYPENAME_KEY_NAME = "__typename";
 
-// @public (undocumented)
-export interface UnauthorizedRequestError {
-    // (undocumented)
-    type: 'unauthorized';
-}
-
 // @public (undocumented)
 export interface UnconstrainedQualifiedEntityList extends QualifiedEntityParameters, EntityCreationParameters, EntityListEventListeners, EntityListPreferences {
     // (undocumented)
@@ -2089,12 +1987,6 @@ export type UniqueEntityId = string & {
 // @public (undocumented)
 export type UniqueWhere<T = GraphQlBuilder.GraphQlLiteral> = Input.UniqueWhere<T>;
 
-// @public (undocumented)
-export interface UnknownErrorRequestError {
-    // (undocumented)
-    type: 'unknownError';
-}
-
 // @public (undocumented)
 export class UnpersistedEntityDummyId implements RuntimeIdSpec {
     constructor();
@@ -2229,16 +2121,6 @@ export interface UnsugarableUnconstrainedQualifiedSingleEntity extends Unsugarab
     isUnpersisted?: boolean;
 }
 
-// @public (undocumented)
-export interface ValidationError {
-    // (undocumented)
-    message: {
-        text: string;
-    };
-    // (undocumented)
-    path: MutationErrorPath;
-}
-
 // @public (undocumented)
 export class VariableFieldValue {
     constructor(variableName: string);
diff --git a/build/api/client-content-generator.api.md b/build/api/client-content-generator.api.md
new file mode 100644
index 0000000000..b28564f613
--- /dev/null
+++ b/build/api/client-content-generator.api.md
@@ -0,0 +1,37 @@
+## API Report File for "@contember/client-content-generator"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { Model } from '@contember/schema';
+import { SchemaNames } from '@contember/client-content';
+
+// @public (undocumented)
+export class ContemberClientGenerator {
+    constructor(nameSchemaGenerator?: NameSchemaGenerator, enumTypeSchemaGenerator?: EnumTypeSchemaGenerator, entityTypeSchemaGenerator?: EntityTypeSchemaGenerator);
+    // (undocumented)
+    generate(model: Model.Schema): Record<string, string>;
+}
+
+// @public (undocumented)
+export class EntityTypeSchemaGenerator {
+    // (undocumented)
+    generate(model: Model.Schema): string;
+}
+
+// @public (undocumented)
+export class EnumTypeSchemaGenerator {
+    // (undocumented)
+    generate(model: Model.Schema): string;
+}
+
+// @public (undocumented)
+export class NameSchemaGenerator {
+    // (undocumented)
+    generate(model: Model.Schema): SchemaNames;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/build/api/client-content.api.md b/build/api/client-content.api.md
new file mode 100644
index 0000000000..f81165f75c
--- /dev/null
+++ b/build/api/client-content.api.md
@@ -0,0 +1,523 @@
+## API Report File for "@contember/client-content"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { GraphQlClientRequestOptions } from '@contember/graphql-client';
+import { GraphQlFieldTypedArgs } from '@contember/graphql-builder';
+import { GraphQlSelectionSet } from '@contember/graphql-builder';
+import { Input } from '@contember/schema';
+import { JSONObject } from '@contember/schema';
+import { Result } from '@contember/schema';
+
+// @public (undocumented)
+export class ContentClient {
+    constructor(executor: QueryExecutor);
+    // (undocumented)
+    mutate<Value>(mutation: ContentMutation<Value>, options?: QueryExecutorOptions): Promise<Value>;
+    // (undocumented)
+    mutate<Value>(mutations: ContentMutation<Value>[], options?: QueryExecutorOptions): Promise<Value[]>;
+    // (undocumented)
+    mutate<Values extends Record<string, any>>(mutations: {
+        [K in keyof Values]: ContentMutation<Values[K]> | ContentQuery<Values[K]>;
+    }, options?: QueryExecutorOptions): Promise<Values>;
+    // (undocumented)
+    query<Value>(query: ContentQuery<Value>, options?: QueryExecutorOptions): Promise<Value>;
+    // (undocumented)
+    query<Values extends Record<string, any>>(queries: {
+        [K in keyof Values]: ContentQuery<Values[K]>;
+    }, options?: QueryExecutorOptions): Promise<Values>;
+}
+
+// @public (undocumented)
+export namespace ContentClientInput {
+    // (undocumented)
+    export type AnyListQueryInput = Omit<Input.ListQueryInput, 'orderBy'> & {
+        readonly orderBy?: AnyOrderBy;
+    };
+    // (undocumented)
+    export type AnyOrderBy = Input.OrderBy<`${Input.OrderDirection}`>[];
+    // (undocumented)
+    export type ConnectOrCreateInput<TEntity extends EntityTypeLike> = {
+        readonly connect: UniqueWhere<TEntity>;
+        readonly create: CreateDataInput<TEntity>;
+    };
+    // (undocumented)
+    export type ConnectOrCreateRelationInput<TEntity extends EntityTypeLike> = {
+        readonly connectOrCreate: ConnectOrCreateInput<TEntity>;
+    };
+    // (undocumented)
+    export type ConnectRelationInput<TEntity extends EntityTypeLike> = {
+        readonly connect: UniqueWhere<TEntity>;
+    };
+    // (undocumented)
+    export type CreateDataInput<TEntity extends EntityTypeLike> = {
+        readonly [key in keyof TEntity['columns']]?: TEntity['columns'][key]['tsType'];
+    } & {
+        readonly [key in keyof TEntity['hasMany']]?: CreateManyRelationInput<TEntity['hasMany'][key]>;
+    } & {
+        readonly [key in keyof TEntity['hasOne']]?: CreateOneRelationInput<TEntity['hasOne'][key]>;
+    };
+    // (undocumented)
+    export type CreateInput<TEntity extends EntityTypeLike> = {
+        readonly data: CreateDataInput<TEntity>;
+    };
+    // (undocumented)
+    export type CreateManyRelationInput<TEntity extends EntityTypeLike> = readonly CreateOneRelationInput<TEntity>[];
+    // (undocumented)
+    export type CreateOneRelationInput<TEntity extends EntityTypeLike> = ConnectRelationInput<TEntity> | CreateRelationInput<TEntity> | ConnectOrCreateRelationInput<TEntity>;
+    // (undocumented)
+    export type CreateRelationInput<TEntity extends EntityTypeLike> = {
+        readonly create: CreateDataInput<TEntity>;
+    };
+    // (undocumented)
+    export type DeleteInput<TEntity extends EntityTypeLike> = {
+        readonly by: UniqueWhere<TEntity>;
+        readonly filter?: Where<TEntity>;
+    };
+    // (undocumented)
+    export type DeleteRelationInput = {
+        readonly delete: true;
+    };
+    // (undocumented)
+    export type DeleteSpecifiedRelationInput<TEntity extends EntityTypeLike> = {
+        readonly delete: UniqueWhere<TEntity>;
+    };
+    // (undocumented)
+    export type DisconnectRelationInput = {
+        readonly disconnect: true;
+    };
+    // (undocumented)
+    export type DisconnectSpecifiedRelationInput<TEntity extends EntityTypeLike> = {
+        readonly disconnect: UniqueWhere<TEntity>;
+    };
+    // (undocumented)
+    export type FieldOrderBy<TEntity extends EntityTypeLike> = {
+        readonly [key in keyof TEntity['columns']]?: `${Input.OrderDirection}` | null;
+    } & {
+        readonly [key in keyof TEntity['hasMany']]?: FieldOrderBy<TEntity['hasMany'][key]> | null;
+    } & {
+        readonly [key in keyof TEntity['hasOne']]?: FieldOrderBy<TEntity['hasOne'][key]> | null;
+    };
+    // (undocumented)
+    export type HasManyByRelationInput<TEntity extends EntityTypeLike, TUnique extends JSONObject> = {
+        readonly by: TUnique;
+        readonly filter?: Where<TEntity>;
+    };
+    // (undocumented)
+    export type HasManyRelationInput<TEntity extends EntityTypeLike> = ListQueryInput<TEntity>;
+    // (undocumented)
+    export type HasManyRelationPaginateInput<TEntity extends EntityTypeLike> = PaginationQueryInput<TEntity>;
+    // (undocumented)
+    export type HasOneRelationInput<TEntity extends EntityTypeLike> = {
+        readonly filter?: Where<TEntity>;
+    };
+    // (undocumented)
+    export type ListQueryInput<TEntity extends EntityTypeLike> = {
+        readonly filter?: Where<TEntity>;
+        readonly orderBy?: readonly OrderBy<TEntity>[];
+        readonly offset?: number;
+        readonly limit?: number;
+    };
+    // (undocumented)
+    export type OrderBy<TEntity extends EntityTypeLike> = {
+        readonly _random?: boolean;
+        readonly _randomSeeded?: number;
+    } & FieldOrderBy<TEntity>;
+    // (undocumented)
+    export type PaginationQueryInput<TEntity extends EntityTypeLike> = {
+        readonly filter?: Where<TEntity>;
+        readonly orderBy?: readonly OrderBy<TEntity>[];
+        readonly skip?: number;
+        readonly first?: number;
+    };
+    // (undocumented)
+    export type UniqueQueryInput<TEntity extends EntityTypeLike> = {
+        readonly by: UniqueWhere<TEntity>;
+        readonly filter?: Where<TEntity>;
+    };
+    // (undocumented)
+    export type UniqueWhere<TEntity extends EntityTypeLike> = TEntity['unique'];
+    // (undocumented)
+    export type UpdateDataInput<TEntity extends EntityTypeLike> = {
+        readonly [key in keyof TEntity['columns']]?: TEntity['columns'][key]['tsType'];
+    } & {
+        readonly [key in keyof TEntity['hasMany']]?: UpdateManyRelationInput<TEntity['hasMany'][key]>;
+    } & {
+        readonly [key in keyof TEntity['hasOne']]?: UpdateOneRelationInput<TEntity['hasOne'][key]>;
+    };
+    // (undocumented)
+    export type UpdateInput<TEntity extends EntityTypeLike> = {
+        readonly by: UniqueWhere<TEntity>;
+        readonly filter?: Where<TEntity>;
+        readonly data: UpdateDataInput<TEntity>;
+    };
+    // (undocumented)
+    export type UpdateManyRelationInput<TEntity extends EntityTypeLike> = Array<UpdateManyRelationInputItem<TEntity>>;
+    // (undocumented)
+    export type UpdateManyRelationInputItem<TEntity extends EntityTypeLike> = CreateRelationInput<TEntity> | ConnectRelationInput<TEntity> | ConnectOrCreateRelationInput<TEntity> | DeleteSpecifiedRelationInput<TEntity> | DisconnectSpecifiedRelationInput<TEntity> | UpdateSpecifiedRelationInput<TEntity> | UpsertSpecifiedRelationInput<TEntity>;
+    // (undocumented)
+    export type UpdateOneRelationInput<TEntity extends EntityTypeLike> = CreateRelationInput<TEntity> | ConnectRelationInput<TEntity> | ConnectOrCreateRelationInput<TEntity> | DeleteRelationInput | DisconnectRelationInput | UpdateRelationInput<TEntity> | UpsertRelationInput<TEntity>;
+    // (undocumented)
+    export type UpdateRelationInput<TEntity extends EntityTypeLike> = {
+        readonly update: UpdateDataInput<TEntity>;
+    };
+    // (undocumented)
+    export type UpdateSpecifiedRelationInput<TEntity extends EntityTypeLike> = {
+        readonly update: {
+            readonly by: UniqueWhere<TEntity>;
+            readonly data: UpdateDataInput<TEntity>;
+        };
+    };
+    // (undocumented)
+    export type UpsertInput<TEntity extends EntityTypeLike> = {
+        readonly by: UniqueWhere<TEntity>;
+        readonly filter?: Where<TEntity>;
+        readonly update: UpdateDataInput<TEntity>;
+        readonly create: CreateDataInput<TEntity>;
+    };
+    // (undocumented)
+    export type UpsertRelationInput<TEntity extends EntityTypeLike> = {
+        readonly upsert: {
+            readonly update: UpdateDataInput<TEntity>;
+            readonly create: CreateDataInput<TEntity>;
+        };
+    };
+    // (undocumented)
+    export type UpsertSpecifiedRelationInput<TEntity extends EntityTypeLike> = {
+        readonly upsert: {
+            readonly by: UniqueWhere<TEntity>;
+            readonly update: UpdateDataInput<TEntity>;
+            readonly create: CreateDataInput<TEntity>;
+        };
+    };
+    // (undocumented)
+    export type Where<TEntity extends EntityTypeLike> = {
+        readonly and?: (readonly (Where<TEntity>)[]) | null;
+        readonly or?: (readonly (Where<TEntity>)[]) | null;
+        readonly not?: Where<TEntity> | null;
+    } & {
+        readonly [key in keyof TEntity['columns']]?: Input.Condition<TEntity['columns'][key]> | null;
+    } & {
+        readonly [key in keyof TEntity['hasMany']]?: Where<TEntity['hasMany'][key]> | null;
+    } & {
+        readonly [key in keyof TEntity['hasOne']]?: Where<TEntity['hasOne'][key]> | null;
+    };
+}
+
+// @public (undocumented)
+export class ContentEntitySelection {
+    // (undocumented)
+    $$(): ContentEntitySelection;
+    // (undocumented)
+    $(field: string, args?: EntitySelectionColumnArgs): ContentEntitySelection;
+    // (undocumented)
+    $(field: string, args: EntitySelectionManyArgs, selection: ContentEntitySelectionOrCallback): ContentEntitySelection;
+    // (undocumented)
+    $(field: string, args: EntitySelectionManyByArgs, selection: ContentEntitySelectionOrCallback): ContentEntitySelection;
+    // (undocumented)
+    $(field: string, args: EntitySelectionOneArgs, selection: ContentEntitySelectionOrCallback): ContentEntitySelection;
+    // (undocumented)
+    $(field: string, selection: ContentEntitySelectionOrCallback): ContentEntitySelection;
+    // @internal
+    constructor(
+    context: ContentEntitySelectionContext<string>,
+    selectionSet: GraphQlSelectionSet);
+    // @internal (undocumented)
+    readonly context: ContentEntitySelectionContext<string>;
+    // @internal (undocumented)
+    readonly selectionSet: GraphQlSelectionSet;
+}
+
+// @public (undocumented)
+export type ContentEntitySelectionCallback = (select: ContentEntitySelection) => ContentEntitySelection;
+
+// @internal (undocumented)
+export type ContentEntitySelectionContext<Name extends string> = {
+    entity: SchemaEntityNames<Name>;
+    schema: SchemaNames;
+};
+
+// @public (undocumented)
+export type ContentEntitySelectionOrCallback = ContentEntitySelectionCallback | ContentEntitySelection;
+
+// @public (undocumented)
+export type ContentMutation<TValue> = ContentOperation<TValue, 'mutation'>;
+
+// @public (undocumented)
+export class ContentOperation<TValue, TType extends 'query' | 'mutation'> {
+    // @internal
+    constructor(
+    type: TType,
+    fieldName: string,
+    args?: GraphQlFieldTypedArgs,
+    selection?: GraphQlSelectionSet | undefined,
+    parse?: (value: any) => TValue);
+    // @internal (undocumented)
+    readonly args: GraphQlFieldTypedArgs;
+    // @internal (undocumented)
+    readonly fieldName: string;
+    // @internal (undocumented)
+    readonly parse: (value: any) => TValue;
+    // @internal (undocumented)
+    readonly selection?: GraphQlSelectionSet | undefined;
+    // @internal (undocumented)
+    readonly type: TType;
+}
+
+// @public (undocumented)
+export type ContentQuery<TValue> = ContentOperation<TValue, 'query'>;
+
+// @public (undocumented)
+export class ContentQueryBuilder {
+    constructor(schema: SchemaNames);
+    // (undocumented)
+    count(name: string, args: Pick<ContentClientInput.AnyListQueryInput, 'filter'>): ContentQuery<number>;
+    // (undocumented)
+    create(name: string, args: Input.CreateInput, fields?: EntitySelectionOrCallback): ContentMutation<MutationResult>;
+    // (undocumented)
+    delete(name: string, args: Input.UniqueQueryInput, fields?: EntitySelectionOrCallback): ContentMutation<MutationResult>;
+    // (undocumented)
+    fragment(name: string, fieldsCallback?: ContentEntitySelectionCallback): ContentEntitySelection;
+    // (undocumented)
+    get(name: string, args: Input.UniqueQueryInput, fields: EntitySelectionOrCallback): ContentQuery<Record<string, unknown> | null>;
+    // (undocumented)
+    list(name: string, args: ContentClientInput.AnyListQueryInput, fields: EntitySelectionOrCallback): ContentQuery<any[]>;
+    // (undocumented)
+    transaction(input: Record<string, ContentMutation<any> | ContentQuery<any>> | ContentMutation<any> | ContentMutation<any>[], options?: MutationTransactionOptions): ContentMutation<TransactionResult<any>>;
+    // (undocumented)
+    update(name: string, args: Input.UpdateInput, fields?: EntitySelectionOrCallback): ContentMutation<MutationResult>;
+    // (undocumented)
+    upsert(name: string, args: Input.UpsertInput, fields?: EntitySelectionOrCallback): ContentMutation<MutationResult>;
+}
+
+// @public (undocumented)
+export type EntitySelectionAnyArgs = EntitySelectionColumnArgs | EntitySelectionManyArgs | EntitySelectionManyByArgs | EntitySelectionOneArgs;
+
+// @public (undocumented)
+export type EntitySelectionColumnArgs<Alias extends string | null = string | null> = EntitySelectionCommonInput<Alias>;
+
+// @public (undocumented)
+export type EntitySelectionCommonInput<Alias extends string | null = string | null> = {
+    as?: Alias;
+};
+
+// @public (undocumented)
+export type EntitySelectionManyArgs<Alias extends string | null = string | null> = ContentClientInput.AnyListQueryInput & EntitySelectionCommonInput<Alias>;
+
+// @public (undocumented)
+export type EntitySelectionManyByArgs<Alias extends string | null = string | null> = {
+    by: Input.UniqueWhere;
+    filter?: Input.Where;
+} & EntitySelectionCommonInput<Alias>;
+
+// @public (undocumented)
+export type EntitySelectionOneArgs<Alias extends string | null = string | null> = {
+    filter?: Input.Where;
+} & EntitySelectionCommonInput<Alias>;
+
+// @public (undocumented)
+export type EntitySelectionOrCallback = ContentEntitySelection | ContentEntitySelectionCallback;
+
+// @public (undocumented)
+export type EntityTypeLike = {
+    name: string;
+    unique: JSONObject;
+    columns: {
+        [columnName: string]: any;
+    };
+    hasOne: {
+        [relationName: string]: EntityTypeLike;
+    };
+    hasMany: {
+        [relationName: string]: EntityTypeLike;
+    };
+    hasManyBy: {
+        [relationName: string]: {
+            entity: EntityTypeLike;
+            by: JSONObject;
+        };
+    };
+};
+
+// @public (undocumented)
+export type FieldPath = {
+    readonly field: string;
+};
+
+// @public (undocumented)
+export type IndexPath = {
+    readonly index: number;
+    readonly alias: string | null;
+};
+
+// @public (undocumented)
+export type MutationError = {
+    readonly paths: Path[];
+    readonly message: string;
+    readonly type: Result.ExecutionErrorType;
+};
+
+// @public (undocumented)
+export type MutationResult<Value = unknown> = {
+    readonly ok: boolean;
+    readonly errorMessage: string | null;
+    readonly errors: MutationError[];
+    readonly node: Value | null;
+    readonly validation?: ValidationResult;
+};
+
+// @public (undocumented)
+export type MutationTransactionOptions = {
+    deferForeignKeyConstraints?: boolean;
+    deferUniqueConstraints?: boolean;
+};
+
+// @public (undocumented)
+export type Path = Array<FieldPath | IndexPath>;
+
+// @public (undocumented)
+export type QueryExecutor = <T = unknown>(query: string, options: GraphQlClientRequestOptions) => Promise<T>;
+
+// @public (undocumented)
+export type QueryExecutorOptions = GraphQlClientRequestOptions;
+
+// @public (undocumented)
+export type SchemaEntityNames<Name extends string> = {
+    readonly name: Name;
+    readonly scalars: string[];
+    readonly fields: {
+        readonly [fieldName: string]: {
+            readonly type: 'column';
+        } | {
+            readonly type: 'many' | 'one';
+            readonly entity: string;
+        };
+    };
+};
+
+// @public (undocumented)
+export type SchemaNames = {
+    entities: {
+        [entityName: string]: SchemaEntityNames<string>;
+    };
+};
+
+// @public (undocumented)
+export type SchemaTypeLike = {
+    entities: {
+        [entityName: string]: EntityTypeLike;
+    };
+};
+
+// @public (undocumented)
+export type TransactionResult<V> = {
+    readonly ok: boolean;
+    readonly errorMessage: string | null;
+    readonly errors: MutationError[];
+    readonly validation: ValidationResult;
+    readonly data: V;
+};
+
+// @public (undocumented)
+export type TypedContentEntitySelectionOrCallback<TSchema extends SchemaTypeLike, TEntityName extends keyof TSchema['entities'] & string, TValue> = TypedEntitySelection<TSchema, TEntityName, TSchema['entities'][TEntityName], TValue> | TypedEntitySelectionCallback<TSchema, TEntityName, TSchema['entities'][TEntityName], TValue>;
+
+// @public (undocumented)
+export interface TypedContentQueryBuilder<TSchema extends SchemaTypeLike> {
+    // (undocumented)
+    count<EntityName extends keyof TSchema['entities'] & string>(name: EntityName, args: Pick<ContentClientInput.ListQueryInput<TSchema['entities'][EntityName]>, 'filter'>): ContentQuery<number>;
+    // (undocumented)
+    create<EntityName extends keyof TSchema['entities'] & string, TValue>(name: EntityName, args: ContentClientInput.CreateInput<TSchema['entities'][EntityName]>, fields?: TypedContentEntitySelectionOrCallback<TSchema, EntityName, TValue>): ContentMutation<MutationResult<TValue>>;
+    // (undocumented)
+    delete<EntityName extends keyof TSchema['entities'] & string, TValue>(name: EntityName, args: ContentClientInput.UniqueQueryInput<TSchema['entities'][EntityName]>, fields?: TypedContentEntitySelectionOrCallback<TSchema, EntityName, TValue>): ContentMutation<MutationResult<TValue>>;
+    // (undocumented)
+    fragment<EntityName extends keyof TSchema['entities'] & string>(name: EntityName): TypedEntitySelection<TSchema, EntityName, TSchema['entities'][EntityName], {}>;
+    // (undocumented)
+    fragment<EntityName extends keyof TSchema['entities'] & string, TFields>(name: EntityName, fieldsCallback: TypedEntitySelectionCallback<TSchema, EntityName, TSchema['entities'][EntityName], TFields>): TypedEntitySelection<TSchema, EntityName, TSchema['entities'][EntityName], TFields>;
+    // (undocumented)
+    get<EntityName extends keyof TSchema['entities'] & string, TValue>(name: EntityName, args: ContentClientInput.UniqueQueryInput<TSchema['entities'][EntityName]>, fields: TypedContentEntitySelectionOrCallback<TSchema, EntityName, TValue>): ContentQuery<TValue | null>;
+    // (undocumented)
+    list<EntityName extends keyof TSchema['entities'] & string, TValue>(name: EntityName, args: ContentClientInput.ListQueryInput<TSchema['entities'][EntityName]>, fields: TypedContentEntitySelectionOrCallback<TSchema, EntityName, TValue>): ContentQuery<TValue[]>;
+    // (undocumented)
+    transaction<Value>(mutation: ContentMutation<Value>, options?: MutationTransactionOptions): ContentMutation<TransactionResult<Value>>;
+    // (undocumented)
+    transaction<Value>(mutations: ContentMutation<Value>[], options?: MutationTransactionOptions): ContentMutation<TransactionResult<Value[]>>;
+    // (undocumented)
+    transaction<Values extends Record<string, any>>(mutations: {
+        [K in keyof Values]: ContentMutation<Values[K]> | ContentQuery<Values[K]>;
+    }, options?: MutationTransactionOptions): ContentMutation<TransactionResult<Values>>;
+    // (undocumented)
+    update<EntityName extends keyof TSchema['entities'] & string, TValue>(name: EntityName, args: ContentClientInput.UpdateInput<TSchema['entities'][EntityName]>, fields?: TypedContentEntitySelectionOrCallback<TSchema, EntityName, TValue>): ContentMutation<MutationResult<TValue>>;
+    // (undocumented)
+    upsert<EntityName extends keyof TSchema['entities'] & string, TValue>(name: EntityName, args: ContentClientInput.UpsertInput<TSchema['entities'][EntityName]>, fields?: TypedContentEntitySelectionOrCallback<TSchema, EntityName, TValue>): ContentMutation<MutationResult<TValue>>;
+}
+
+// @public (undocumented)
+export interface TypedEntitySelection<TSchema extends SchemaTypeLike, TEntityName extends string, TEntity extends EntityTypeLike, TValue> {
+    // (undocumented)
+    $$(): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
+        [key in keyof TEntity['columns']]: TEntity['columns'][key];
+    }>;
+    // (undocumented)
+    $<TKey extends (keyof TEntity['columns']) & string, TAlias extends string | null = null>(name: TKey, args?: {
+        as?: TAlias;
+    }): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
+        [key in TAlias extends null ? TKey : TAlias]: TEntity['columns'][key];
+    }>;
+    // (undocumented)
+    $<TNestedValue, TNestedKey extends keyof TEntity['hasMany'] & string, TAlias extends string | null = null>(name: TNestedKey, args: ContentClientInput.HasManyRelationInput<TEntity['hasMany'][TNestedKey]> & {
+        as?: TAlias;
+    }, fields: TypedEntitySelectionCallback<TSchema, TEntity['hasMany'][TNestedKey]['name'], TEntity['hasMany'][TNestedKey], TNestedValue> | TypedEntitySelection<TSchema, TEntity['hasMany'][TNestedKey]['name'], TEntity['hasMany'][TNestedKey], TNestedValue>): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
+        [key in TAlias extends null ? TNestedKey : TAlias]: TNestedValue[];
+    }>;
+    // (undocumented)
+    $<TNestedValue, TNestedKey extends keyof TEntity['hasMany'] & string, TAlias extends string | null = null>(name: TNestedKey, fields: TypedEntitySelectionCallback<TSchema, TEntity['hasMany'][TNestedKey]['name'], TEntity['hasMany'][TNestedKey], TNestedValue> | TypedEntitySelection<TSchema, TEntity['hasMany'][TNestedKey]['name'], TEntity['hasMany'][TNestedKey], TNestedValue>): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
+        [key in TAlias extends null ? TNestedKey : TAlias]: TNestedValue[];
+    }>;
+    // (undocumented)
+    $<TNestedValue, TNestedKey extends keyof TEntity['hasManyBy'] & string, TAlias extends string | null = null>(name: TNestedKey, args: ContentClientInput.HasManyByRelationInput<TEntity['hasManyBy'][TNestedKey]['entity'], TEntity['hasManyBy'][TNestedKey]['by']> & {
+        as?: TAlias;
+    }, fields: TypedEntitySelectionCallback<TSchema, TEntity['hasManyBy'][TNestedKey]['entity']['name'], TEntity['hasManyBy'][TNestedKey]['entity'], TNestedValue> | TypedEntitySelection<TSchema, TEntity['hasManyBy'][TNestedKey]['entity']['name'], TEntity['hasManyBy'][TNestedKey]['entity'], TNestedValue>): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
+        [key in TAlias extends null ? TNestedKey : TAlias]: null | TNestedValue;
+    }>;
+    // (undocumented)
+    $<TNestedValue, TNestedKey extends keyof TEntity['hasManyBy'] & string, TAlias extends string | null = null>(name: TNestedKey, fields: TypedEntitySelectionCallback<TSchema, TEntity['hasManyBy'][TNestedKey]['entity']['name'], TEntity['hasManyBy'][TNestedKey]['entity'], TNestedValue> | TypedEntitySelection<TSchema, TEntity['hasManyBy'][TNestedKey]['entity']['name'], TEntity['hasManyBy'][TNestedKey]['entity'], TNestedValue>): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
+        [key in TAlias extends null ? TNestedKey : TAlias]: null | TNestedValue;
+    }>;
+    // (undocumented)
+    $<TNestedValue extends {
+        [K in string]: unknown;
+    }, TNestedKey extends keyof TEntity['hasOne'] & string, TAlias extends string | null = null>(name: TNestedKey, args: ContentClientInput.HasOneRelationInput<TEntity['hasOne'][TNestedKey]> & {
+        as?: TAlias;
+    }, fields: TypedEntitySelectionCallback<TSchema, TEntity['hasOne'][TNestedKey]['name'], TEntity['hasOne'][TNestedKey], TNestedValue> | TypedEntitySelection<TSchema, TEntity['hasOne'][TNestedKey]['name'], TEntity['hasOne'][TNestedKey], TNestedValue>): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
+        [key in TAlias extends null ? TNestedKey : TAlias]: TNestedValue | null;
+    }>;
+    // (undocumented)
+    $<TNestedValue extends {
+        [K in string]: unknown;
+    }, TNestedKey extends keyof TEntity['hasOne'] & string, TAlias extends string | null = null>(name: TNestedKey, fields: TypedEntitySelectionCallback<TSchema, TEntity['hasOne'][TNestedKey]['name'], TEntity['hasOne'][TNestedKey], TNestedValue> | TypedEntitySelection<TSchema, TEntity['hasOne'][TNestedKey]['name'], TEntity['hasOne'][TNestedKey], TNestedValue>): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
+        [key in TAlias extends null ? TNestedKey : TAlias]: TNestedValue | null;
+    }>;
+}
+
+// @public (undocumented)
+export type TypedEntitySelectionCallback<TSchema extends SchemaTypeLike, EntityName extends string, TEntity extends EntityTypeLike, TValue> = (select: TypedEntitySelection<TSchema, EntityName, TEntity, {}>) => TypedEntitySelection<TSchema, EntityName, TEntity, TValue>;
+
+// @public (undocumented)
+export type ValidationError = {
+    readonly path: Path;
+    readonly message: {
+        text: string;
+    };
+};
+
+// @public (undocumented)
+export type ValidationResult = {
+    readonly valid: boolean;
+    readonly errors: ValidationError[];
+};
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/build/api/client-generator.api.md b/build/api/client-generator.api.md
new file mode 100644
index 0000000000..f9fc3082c8
--- /dev/null
+++ b/build/api/client-generator.api.md
@@ -0,0 +1,37 @@
+## API Report File for "@contember/client-generator"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { Model } from '@contember/schema';
+import { SchemaNames } from '@contember/client';
+
+// @public (undocumented)
+export class ContemberClientGenerator {
+    constructor(nameSchemaGenerator?: NameSchemaGenerator, enumTypeSchemaGenerator?: EnumTypeSchemaGenerator, entityTypeSchemaGenerator?: EntityTypeSchemaGenerator);
+    // (undocumented)
+    generate(model: Model.Schema): Record<string, string>;
+}
+
+// @public (undocumented)
+export class EntityTypeSchemaGenerator {
+    // (undocumented)
+    generate(model: Model.Schema): string;
+}
+
+// @public (undocumented)
+export class EnumTypeSchemaGenerator {
+    // (undocumented)
+    generate(model: Model.Schema): string;
+}
+
+// @public (undocumented)
+export class NameSchemaGenerator {
+    // (undocumented)
+    generate(model: Model.Schema): SchemaNames;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/build/api/client.api.md b/build/api/client.api.md
index a8e3b9897f..fdfa17dc65 100644
--- a/build/api/client.api.md
+++ b/build/api/client.api.md
@@ -4,6 +4,13 @@
 
 ```ts
 
+import { GraphQlClient as GraphQlClient_2 } from '@contember/graphql-client';
+import { GraphQlClientError } from '@contember/graphql-client';
+import { GraphQlClientRequestOptions as GraphQlClientRequestOptions_2 } from '@contember/graphql-client';
+import { GraphQlClientVariables } from '@contember/graphql-client';
+import { GraphQlErrorRequest } from '@contember/graphql-client';
+import { GraphQlErrorType } from '@contember/graphql-client';
+import { GraphQlPrintResult } from '@contember/graphql-builder';
 import { Input } from '@contember/schema';
 import { Result } from '@contember/schema';
 import { Value } from '@contember/schema';
@@ -11,53 +18,10 @@ import { Writable } from '@contember/schema';
 
 // @public (undocumented)
 export namespace CrudQueryBuilder {
-    import CrudQueryBuilder = CrudQueryBuilderTmp.CrudQueryBuilder;
-    import ReadBuilder = CrudQueryBuilderTmp.ReadBuilder;
-    import WriteBuilder = CrudQueryBuilderTmp.WriteBuilder;
-    import WriteDataBuilder = CrudQueryBuilderTmp.WriteDataBuilder;
-    import WriteManyRelationBuilder = CrudQueryBuilderTmp.WriteManyRelationBuilder;
-    import WriteOneRelationBuilder = CrudQueryBuilderTmp.WriteOneRelationBuilder;
-    import WriteOperation = CrudQueryBuilderTmp.WriteOperation;
     // Warning: (ae-forgotten-export) The symbol "CrudQueryBuilderTmp" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
-    export type CreateMutationArguments = CrudQueryBuilderTmp.CreateMutationArguments;
-    // (undocumented)
-    export type CreateMutationFields = CrudQueryBuilderTmp.CreateMutationFields;
-    // (undocumented)
-    export type DeleteMutationArguments = CrudQueryBuilderTmp.DeleteMutationArguments;
-    // (undocumented)
-    export type DeleteMutationFields = CrudQueryBuilderTmp.DeleteMutationFields;
-    // (undocumented)
-    export type GetQueryArguments = CrudQueryBuilderTmp.GetQueryArguments;
-    // (undocumented)
-    export type HasManyArguments = CrudQueryBuilderTmp.HasManyArguments;
-    // (undocumented)
-    export type HasOneArguments = CrudQueryBuilderTmp.HasOneArguments;
-    // (undocumented)
-    export type ListQueryArguments = CrudQueryBuilderTmp.ListQueryArguments;
-    // (undocumented)
-    export type Mutations = CrudQueryBuilderTmp.Mutations;
-    // (undocumented)
     export type OrderDirection = CrudQueryBuilderTmp.OrderDirection;
-    // (undocumented)
-    export type PaginateQueryArguments = CrudQueryBuilderTmp.PaginateQueryArguments;
-    // (undocumented)
-    export type Queries = CrudQueryBuilderTmp.Queries;
-    // (undocumented)
-    export type ReadArguments = CrudQueryBuilderTmp.ReadArguments;
-    // (undocumented)
-    export type ReductionArguments = CrudQueryBuilderTmp.ReductionArguments;
-    // (undocumented)
-    export type UpdateMutationArguments = CrudQueryBuilderTmp.UpdateMutationArguments;
-    // (undocumented)
-    export type UpdateMutationFields = CrudQueryBuilderTmp.UpdateMutationFields;
-    // (undocumented)
-    export type WriteArguments = CrudQueryBuilderTmp.WriteArguments;
-    // (undocumented)
-    export type WriteFields = CrudQueryBuilderTmp.WriteFields;
-    // (undocumented)
-    export type WriteRelationOps = CrudQueryBuilderTmp.WriteRelationOps;
 }
 
 // @public (undocumented)
@@ -109,33 +73,25 @@ export const formatSystemApiRelativeUrl: (projectSlug: string) => string;
 
 // @public (undocumented)
 export class GenerateUploadUrlMutationBuilder {
-    // (undocumented)
-    static buildQuery(parameters: GenerateUploadUrlMutationBuilder.MutationParameters): string;
+    // @internal (undocumented)
+    static buildQuery(parameters: GenerateUploadUrlMutationBuilder.MutationParameters): GraphQlPrintResult;
 }
 
 // @public (undocumented)
 export namespace GenerateUploadUrlMutationBuilder {
     // (undocumented)
-    export type Acl = GraphQlLiteral<'PUBLIC_READ' | 'PRIVATE' | 'NONE'>;
+    export type Acl = 'PUBLIC_READ' | 'PRIVATE' | 'NONE' | GraphQlLiteral<'PUBLIC_READ' | 'PRIVATE' | 'NONE'>;
     // (undocumented)
-    export interface FileParameters {
-        // (undocumented)
-        acl?: Acl;
-        // (undocumented)
+    export type FileParameters = {
         contentType: string;
-        // (undocumented)
         expiration?: number;
-        // (undocumented)
-        extension?: string;
-        // (undocumented)
-        fileName?: string;
-        // (undocumented)
-        prefix?: string;
-        // (undocumented)
         size?: number;
-        // (undocumented)
+        prefix?: string;
+        extension?: string;
         suffix?: string;
-    }
+        fileName?: string;
+        acl?: Acl;
+    };
     // (undocumented)
     export interface MutationParameters {
         // (undocumented)
@@ -169,45 +125,34 @@ export const getTenantErrorMessage: (errorCode: string) => string;
 export namespace GraphQlBuilder {
     import GraphqlLiteral = GraphQlBuilderTmp.GraphQlLiteral;
     import GraphQlLiteral = GraphQlBuilderTmp.GraphQlLiteral;
-    import ObjectBuilder = GraphQlBuilderTmp.ObjectBuilder;
-    import QueryCompiler = GraphQlBuilderTmp.QueryCompiler;
-    import QueryBuilder = GraphQlBuilderTmp.QueryBuilder;
-    import RootObjectBuilder = GraphQlBuilderTmp.RootObjectBuilder;
 }
 
 // @public (undocumented)
-export class GraphQlClient {
-    constructor(apiUrl: string, apiToken?: string | undefined);
-    // (undocumented)
-    readonly apiUrl: string;
-    // (undocumented)
-    sendRequest<T = unknown>(query: string, { apiTokenOverride, signal, variables, headers }?: GraphQlClientRequestOptions): Promise<T>;
+export class GraphQlClient extends GraphQlClient_2 {
+    // @deprecated (undocumented)
+    sendRequest<T = unknown>(query: string, options?: GraphQlClientRequestOptions): Promise<T>;
 }
 
+export { GraphQlClientError }
+
 // @public (undocumented)
 export type GraphQlClientFailedRequestMetadata = Pick<Response, 'status' | 'statusText'> & {
     responseText: string;
 };
 
 // @public (undocumented)
-export interface GraphQlClientRequestOptions {
-    // (undocumented)
+export interface GraphQlClientRequestOptions extends GraphQlClientRequestOptions_2 {
+    // @deprecated (undocumented)
     apiTokenOverride?: string;
-    // (undocumented)
-    headers?: Record<string, string>;
-    // (undocumented)
-    signal?: AbortSignal;
-    // (undocumented)
-    variables?: GraphQlClientVariables;
 }
 
-// @public (undocumented)
-export interface GraphQlClientVariables {
-    // (undocumented)
-    [name: string]: any;
-}
+export { GraphQlClientVariables }
 
-// @public (undocumented)
+export { GraphQlErrorRequest }
+
+export { GraphQlErrorType }
+
+// @public @deprecated (undocumented)
 export class GraphQlLiteral<Value extends string = string> {
     constructor(value: Value);
     // (undocumented)
@@ -262,6 +207,14 @@ export interface RelationFilter {
     relations: RelationFilter[];
 }
 
+// @public (undocumented)
+export type ReplaceGraphQlLiteral<T> = T extends GraphQlLiteral<infer Value> ? Value : T extends string | number | boolean | null ? T : T extends {} ? {
+    [K in keyof T]: ReplaceGraphQlLiteral<T[K]>;
+} : T extends any[] ? ReplaceGraphQlLiteral<T[number]>[] : T;
+
+// @public (undocumented)
+export const replaceGraphQlLiteral: <T>(input: T) => ReplaceGraphQlLiteral<T>;
+
 export { Result }
 
 // @public (undocumented)
@@ -357,6 +310,9 @@ export const whereToFilter: (by: Input.UniqueWhere<GraphQlLiteral>) => Input.Whe
 
 export { Writable }
 
+
+export * from "@contember/client-content";
+
 // (No @packageDocumentation comment for this package)
 
 ```
diff --git a/build/api/graphql-builder.api.md b/build/api/graphql-builder.api.md
new file mode 100644
index 0000000000..2293e8bf47
--- /dev/null
+++ b/build/api/graphql-builder.api.md
@@ -0,0 +1,75 @@
+## API Report File for "@contember/graphql-builder"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { JSONValue } from '@contember/schema';
+
+// @public (undocumented)
+export class GraphQlField {
+    constructor(alias: string | null, name: string, args?: GraphQlFieldTypedArgs, selectionSet?: GraphQlSelectionSet | undefined);
+    // (undocumented)
+    readonly alias: string | null;
+    // (undocumented)
+    readonly args: GraphQlFieldTypedArgs;
+    // (undocumented)
+    readonly name: string;
+    // (undocumented)
+    readonly selectionSet?: GraphQlSelectionSet | undefined;
+}
+
+// @public (undocumented)
+export type GraphQlFieldTypedArgs = Record<string, {
+    graphQlType: string;
+    value?: JSONValue;
+}>;
+
+// @public (undocumented)
+export class GraphQlFragment {
+    constructor(name: string, type: string, selectionSet: GraphQlSelectionSet);
+    // (undocumented)
+    readonly name: string;
+    // (undocumented)
+    readonly selectionSet: GraphQlSelectionSet;
+    // (undocumented)
+    readonly type: string;
+}
+
+// @public (undocumented)
+export class GraphQlFragmentSpread {
+    constructor(name: string);
+    // (undocumented)
+    readonly name: string;
+}
+
+// @public (undocumented)
+export class GraphQlInlineFragment {
+    constructor(type: string, selectionSet: GraphQlSelectionSet);
+    // (undocumented)
+    readonly selectionSet: GraphQlSelectionSet;
+    // (undocumented)
+    readonly type: string;
+}
+
+// @public (undocumented)
+export type GraphQlPrintResult = {
+    query: string;
+    variables: Record<string, JSONValue>;
+};
+
+// @public (undocumented)
+export class GraphQlQueryPrinter {
+    // (undocumented)
+    printDocument(operation: 'query' | 'mutation', select: GraphQlSelectionSet, fragments: Record<string, GraphQlFragment>): GraphQlPrintResult;
+}
+
+// @public (undocumented)
+export type GraphQlSelectionSet = GraphQlSelectionSetItem[];
+
+// @public (undocumented)
+export type GraphQlSelectionSetItem = GraphQlField | GraphQlFragmentSpread | GraphQlInlineFragment;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/build/api/graphql-client.api.md b/build/api/graphql-client.api.md
new file mode 100644
index 0000000000..6cd1d9c1a9
--- /dev/null
+++ b/build/api/graphql-client.api.md
@@ -0,0 +1,72 @@
+## API Report File for "@contember/graphql-client"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export class GraphQlClient {
+    constructor(apiUrl: string, apiToken?: string | undefined);
+    // (undocumented)
+    readonly apiUrl: string;
+    // (undocumented)
+    protected doExecute(query: string, { apiToken, signal, variables, headers }?: GraphQlClientRequestOptions): Promise<Response>;
+    // (undocumented)
+    execute<T = unknown>(query: string, options?: GraphQlClientRequestOptions): Promise<T>;
+}
+
+// @public (undocumented)
+export class GraphQlClientError extends Error {
+    constructor(message: string, type: GraphQlErrorType, request: GraphQlErrorRequest, response?: Response | undefined, errors?: readonly any[] | undefined, details?: string | undefined, cause?: unknown);
+    // (undocumented)
+    readonly details?: string | undefined;
+    // (undocumented)
+    readonly errors?: readonly any[] | undefined;
+    // (undocumented)
+    readonly request: GraphQlErrorRequest;
+    // (undocumented)
+    readonly response?: Response | undefined;
+    // (undocumented)
+    readonly type: GraphQlErrorType;
+}
+
+// @public (undocumented)
+export interface GraphQlClientRequestOptions {
+    // (undocumented)
+    apiToken?: string;
+    // (undocumented)
+    headers?: Record<string, string>;
+    // (undocumented)
+    onBeforeRequest?: (query: {
+        query: string;
+        variables: GraphQlClientVariables;
+    }) => void;
+    // (undocumented)
+    onData?: (json: unknown) => void;
+    // (undocumented)
+    onResponse?: (response: Response) => void;
+    // (undocumented)
+    signal?: AbortSignal;
+    // (undocumented)
+    variables?: GraphQlClientVariables;
+}
+
+// @public (undocumented)
+export interface GraphQlClientVariables {
+    // (undocumented)
+    [name: string]: any;
+}
+
+// @public (undocumented)
+export type GraphQlErrorRequest = {
+    url: string;
+    query: string;
+    variables: Record<string, any>;
+};
+
+// @public (undocumented)
+export type GraphQlErrorType = 'aborted' | 'network error' | 'invalid response body' | 'bad request' | 'unauthorized' | 'forbidden' | 'server error' | 'response errors';
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/build/api/react-binding.api.md b/build/api/react-binding.api.md
index 7b198c23f0..a5ec56a757 100644
--- a/build/api/react-binding.api.md
+++ b/build/api/react-binding.api.md
@@ -21,6 +21,7 @@ import type { FieldName } from '@contember/binding';
 import { FieldValue } from '@contember/binding';
 import { Filter } from '@contember/binding';
 import type { GetEntityByKey } from '@contember/binding';
+import { GraphQlClientError } from '@contember/react-client';
 import type { HasManyRelationMarker } from '@contember/binding';
 import type { HasOneRelationMarker } from '@contember/binding';
 import { MarkerTreeRoot } from '@contember/binding';
@@ -32,7 +33,6 @@ import { ReactNode } from 'react';
 import type { RelativeEntityList } from '@contember/binding';
 import type { RelativeSingleEntity } from '@contember/binding';
 import { RelativeSingleField } from '@contember/binding';
-import type { RequestError } from '@contember/binding';
 import type { SugaredParentEntityParameters } from '@contember/binding';
 import type { SugaredQualifiedEntityList } from '@contember/binding';
 import type { SugaredQualifiedSingleEntity } from '@contember/binding';
@@ -72,7 +72,7 @@ export type AccessorTreeStateAction = {
     binding: DataBinding<ReactNode>;
 } | {
     type: 'failWithError';
-    error: RequestError;
+    error: GraphQlClientError;
     binding: DataBinding<ReactNode>;
 } | {
     type: 'reset';
@@ -316,7 +316,7 @@ export interface ErrorAccessorTreeState {
     // (undocumented)
     environment: Environment;
     // (undocumented)
-    error: RequestError;
+    error: GraphQlClientError;
     // (undocumented)
     name: 'error';
 }